rustc: Change the filename of compressed bitcode

Fixes #12992
Store compressed bitcode files in rlibs with a different extension. Compression doesn't interfere with --emit=bc.
Regression test compares outputs.

diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs
index 201f7557398a4090f26fd80e78147f35c3d97bea..f198a41af655754fa3c8e5fe67412a04423f3658 100644 (file)
--- a/src/librustc/back/link.rs
+++ b/src/librustc/back/link.rs
@@ -937,8 +937,9 @@ fn link_rlib<'a>(sess: &'a Session,
             // For LTO purposes, the bytecode of this library is also inserted
             // into the archive.
             let bc = obj_filename.with_extension("bc");
+            let bc_deflated = obj_filename.with_extension("bc.deflate");
             match fs::File::open(&bc).read_to_end().and_then(|data| {
-                fs::File::create(&bc).write(flate::deflate_bytes(data).as_slice())
+                fs::File::create(&bc_deflated).write(flate::deflate_bytes(data).as_slice())
             }) {
                 Ok(()) => {}
                 Err(e) => {
@@ -946,7 +947,8 @@ fn link_rlib<'a>(sess: &'a Session,
                     sess.abort_if_errors()
                 }
             }
-            a.add_file(&bc, false);
+            a.add_file(&bc_deflated, false);
+            remove(sess, &bc_deflated);
             if !sess.opts.cg.save_temps &&
                !sess.opts.output_types.contains(&OutputTypeBitcode) {
                 remove(sess, &bc);

diff --git a/src/librustc/back/lto.rs b/src/librustc/back/lto.rs
index 1183c78b2a878ea944df36832f919fe6ade320b9..ef3496f113b599fdc8dae389ee93a88bf68bdfc3 100644 (file)
--- a/src/librustc/back/lto.rs
+++ b/src/librustc/back/lto.rs
@@ -52,9 +52,9 @@ pub fn run(sess: &session::Session, llmod: ModuleRef,
 
         let archive = ArchiveRO::open(&path).expect("wanted an rlib");
         debug!("reading {}", name);
-        let bc = time(sess.time_passes(), format!("read {}.bc", name), (), |_|
-                      archive.read(format!("{}.bc", name)));
-        let bc = bc.expect("missing bytecode in archive!");
+        let bc = time(sess.time_passes(), format!("read {}.bc.deflate", name), (), |_|
+                      archive.read(format!("{}.bc.deflate", name)));
+        let bc = bc.expect("missing compressed bytecode in archive!");
         let bc = time(sess.time_passes(), format!("inflate {}.bc", name), (), |_|
                       flate::inflate_bytes(bc));
         let ptr = bc.as_slice().as_ptr();

diff --git a/src/test/run-make/output-type-permutations/Makefile b/src/test/run-make/output-type-permutations/Makefile
index 72f96b21fa8b2e3bc79d78fef5391bca7bfe531a..94e0ce833438f1e72b22fa84da64ce61b402b4ed 100644 (file)
--- a/src/test/run-make/output-type-permutations/Makefile
+++ b/src/test/run-make/output-type-permutations/Makefile
@@ -15,7 +15,6 @@ all:
        rm $(TMPDIR)/bar
        $(RUSTC) foo.rs --emit=asm,ir,bc,obj,link --crate-type=staticlib
        rm $(TMPDIR)/bar.ll
-       rm $(TMPDIR)/bar.bc
        rm $(TMPDIR)/bar.s
        rm $(TMPDIR)/bar.o
        rm $(TMPDIR)/$(call STATICLIB_GLOB,bar)
@@ -37,6 +36,9 @@ all:
        rm $(TMPDIR)/foo
        $(RUSTC) foo.rs --crate-type=bin -o $(TMPDIR)/foo
        rm $(TMPDIR)/foo
+       mv $(TMPDIR)/bar.bc $(TMPDIR)/foo.bc
        $(RUSTC) foo.rs --emit=bc,link --crate-type=rlib
+       cmp $(TMPDIR)/foo.bc $(TMPDIR)/bar.bc
        rm $(TMPDIR)/bar.bc
+       rm $(TMPDIR)/foo.bc
        rm $(TMPDIR)/$(call RLIB_GLOB,bar)