From 485e52e1539d7fb1916c201a73f3d467a18646bf Mon Sep 17 00:00:00 2001
From: bjorn3 <bjorn3@users.noreply.github.com>
Date: Fri, 1 May 2020 17:51:51 +0200
Subject: [PATCH] Rustup to rustc 1.45.0-nightly (7ced01a73 2020-04-30)

---
 rust-toolchain    | 2 +-
 src/archive.rs    | 6 +++---
 src/driver/aot.rs | 5 +----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/rust-toolchain b/rust-toolchain
index 07c9621f2a8..1bc2439682e 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly-2020-04-30
+nightly-2020-05-01
diff --git a/src/archive.rs b/src/archive.rs
index f8ea9176fff..d3c24c556f3 100644
--- a/src/archive.rs
+++ b/src/archive.rs
@@ -4,7 +4,7 @@ use std::path::{Path, PathBuf};
 use crate::prelude::*;
 
 use rustc_codegen_ssa::back::archive::{find_library, ArchiveBuilder};
-use rustc_codegen_ssa::{METADATA_FILENAME, RLIB_BYTECODE_EXTENSION};
+use rustc_codegen_ssa::METADATA_FILENAME;
 
 struct ArchiveConfig<'a> {
     sess: &'a Session,
@@ -116,8 +116,8 @@ impl<'a> ArchiveBuilder<'a> for ArArchiveBuilder<'a> {
         let obj_start = name.to_owned();
 
         self.add_archive(rlib.to_owned(), move |fname: &str| {
-            // Ignore bytecode/metadata files, no matter the name.
-            if fname.ends_with(RLIB_BYTECODE_EXTENSION) || fname == METADATA_FILENAME {
+            // Ignore metadata files, no matter the name.
+            if fname == METADATA_FILENAME {
                 return true;
             }
 
diff --git a/src/driver/aot.rs b/src/driver/aot.rs
index 6ab5b40d3ce..76bd614b164 100644
--- a/src/driver/aot.rs
+++ b/src/driver/aot.rs
@@ -64,7 +64,6 @@ fn emit_module<B: Backend>(
             kind,
             object: Some(tmp_file),
             bytecode: None,
-            bytecode_compressed: None,
         },
         work_product,
     )
@@ -85,7 +84,7 @@ fn reuse_workproduct_for_cgu(
                 object = Some(path.clone());
                 path
             }
-            WorkProductFileKind::Bytecode | WorkProductFileKind::BytecodeCompressed => {
+            WorkProductFileKind::Bytecode => {
                 panic!("cg_clif doesn't use bytecode");
             }
         };
@@ -107,7 +106,6 @@ fn reuse_workproduct_for_cgu(
         kind: ModuleKind::Regular,
         object,
         bytecode: None,
-        bytecode_compressed: None,
     }
 }
 
@@ -239,7 +237,6 @@ pub(super) fn run_aot(
             kind: ModuleKind::Metadata,
             object: Some(tmp_file),
             bytecode: None,
-            bytecode_compressed: None,
         })
     } else {
         None