From 1ffc3079b036ffb115a37b7ac90f9013db607f74 Mon Sep 17 00:00:00 2001
From: bjorn3 <bjorn3@users.noreply.github.com>
Date: Thu, 23 Jul 2020 11:42:44 +0200
Subject: [PATCH] Rustup to rustc 1.47.0-nightly (bbebe7351 2020-07-22)

---
 build_sysroot/Cargo.lock | 93 +++++++++++++++++++++++++++-------------
 rust-toolchain           |  2 +-
 src/abi/mod.rs           |  4 +-
 src/constant.rs          |  2 +-
 4 files changed, 68 insertions(+), 33 deletions(-)

diff --git a/build_sysroot/Cargo.lock b/build_sysroot/Cargo.lock
index 2975e8acf698..0cf603a14a33 100644
--- a/build_sysroot/Cargo.lock
+++ b/build_sysroot/Cargo.lock
@@ -1,5 +1,27 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+[[package]]
+name = "addr2line"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b6a2d3371669ab3ca9797670853d61402b03d0b4b9ebf33d677dfa720203072"
+dependencies = [
+ "compiler_builtins",
+ "gimli",
+ "rustc-std-workspace-alloc",
+ "rustc-std-workspace-core",
+]
+
+[[package]]
+name = "adler"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e"
+dependencies = [
+ "compiler_builtins",
+ "rustc-std-workspace-core",
+]
+
 [[package]]
 name = "alloc"
 version = "0.0.0"
@@ -23,32 +45,6 @@ version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
 
-[[package]]
-name = "backtrace"
-version = "0.3.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46254cf2fdcdf1badb5934448c1bcbe046a56537b3987d96c51a7afc5d03f293"
-dependencies = [
- "backtrace-sys",
- "cfg-if",
- "compiler_builtins",
- "libc",
- "rustc-demangle",
- "rustc-std-workspace-core",
-]
-
-[[package]]
-name = "backtrace-sys"
-version = "0.1.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18fbebbe1c9d1f383a9cc7e8ccdb471b91c8d024ee9c2ca5b5346121fe8b4399"
-dependencies = [
- "cc",
- "compiler_builtins",
- "libc",
- "rustc-std-workspace-core",
-]
-
 [[package]]
 name = "cc"
 version = "1.0.58"
@@ -110,6 +106,17 @@ dependencies = [
  "unicode-width",
 ]
 
+[[package]]
+name = "gimli"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aaf91faf136cb47367fa430cd46e37a788775e7fa104f8b4bcb3861dc389b724"
+dependencies = [
+ "compiler_builtins",
+ "rustc-std-workspace-alloc",
+ "rustc-std-workspace-core",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.6.3"
@@ -135,17 +142,41 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.72"
+version = "0.2.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9f8082297d534141b30c8d39e9b1773713ab50fdbe4ff30f750d063b3bfd701"
+checksum = "bd7d4bd64732af4bf3a67f367c27df8520ad7e230c5817b8ff485864d80242b9"
 dependencies = [
  "rustc-std-workspace-core",
 ]
 
+[[package]]
+name = "miniz_oxide"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be0f75932c1f6cfae3c04000e40114adf955636e19040f9c0a2c380702aa1c7f"
+dependencies = [
+ "adler",
+ "compiler_builtins",
+ "rustc-std-workspace-alloc",
+ "rustc-std-workspace-core",
+]
+
+[[package]]
+name = "object"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5"
+dependencies = [
+ "compiler_builtins",
+ "rustc-std-workspace-alloc",
+ "rustc-std-workspace-core",
+]
+
 [[package]]
 name = "panic_abort"
 version = "0.0.0"
 dependencies = [
+ "cfg-if",
  "compiler_builtins",
  "core",
  "libc",
@@ -205,8 +236,8 @@ dependencies = [
 name = "std"
 version = "0.0.0"
 dependencies = [
+ "addr2line",
  "alloc",
- "backtrace",
  "cfg-if",
  "compiler_builtins",
  "core",
@@ -215,8 +246,11 @@ dependencies = [
  "hashbrown",
  "hermit-abi",
  "libc",
+ "miniz_oxide",
+ "object",
  "panic_abort",
  "panic_unwind",
+ "rustc-demangle",
  "unwind",
  "wasi",
 ]
@@ -245,6 +279,7 @@ dependencies = [
 name = "test"
 version = "0.0.0"
 dependencies = [
+ "cfg-if",
  "core",
  "getopts",
  "libc",
diff --git a/rust-toolchain b/rust-toolchain
index 1903f2c25cde..3e0f3c666328 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly-2020-07-17
+nightly-2020-07-23
diff --git a/src/abi/mod.rs b/src/abi/mod.rs
index 0a6d54c73b3e..cbbdb1fab0b1 100644
--- a/src/abi/mod.rs
+++ b/src/abi/mod.rs
@@ -15,7 +15,7 @@ pub(crate) use self::returning::{can_return_to_ssa_var, codegen_return};
 
 // Copied from https://github.com/rust-lang/rust/blob/b2c1a606feb1fbdb0ac0acba76f881ef172ed474/src/librustc_middle/ty/layout.rs#L2287
 pub(crate) fn fn_sig_for_fn_abi<'tcx>(tcx: TyCtxt<'tcx>, instance: Instance<'tcx>) -> ty::PolyFnSig<'tcx> {
-    let ty = instance.monomorphic_ty(tcx);
+    let ty = instance.ty(tcx, ParamEnv::reveal_all());
     match ty.kind {
         ty::FnDef(..) |
         // Shims currently have type FnPtr. Not sure this should remain.
@@ -660,7 +660,7 @@ pub(crate) fn codegen_drop<'tcx>(
     if let ty::InstanceDef::DropGlue(_, None) = drop_fn.def {
         // we don't actually need to drop anything
     } else {
-        let drop_fn_ty = drop_fn.monomorphic_ty(fx.tcx);
+        let drop_fn_ty = drop_fn.ty(fx.tcx, ParamEnv::reveal_all());
         let fn_sig = fx.tcx.normalize_erasing_late_bound_regions(
             ParamEnv::reveal_all(),
             &drop_fn_ty.fn_sig(fx.tcx),
diff --git a/src/constant.rs b/src/constant.rs
index 139dcb5988f3..82d50a1e444a 100644
--- a/src/constant.rs
+++ b/src/constant.rs
@@ -230,7 +230,7 @@ fn data_id_for_static(
 ) -> DataId {
     let instance = Instance::mono(tcx, def_id);
     let symbol_name = tcx.symbol_name(instance).name;
-    let ty = instance.monomorphic_ty(tcx);
+    let ty = instance.ty(tcx, ParamEnv::reveal_all());
     let is_mutable = if tcx.is_mutable_static(def_id) {
         true
     } else {