From 43e68319fabb4f55071618e2a40ec534f4fbe9bc Mon Sep 17 00:00:00 2001
From: bjorn3 <bjorn3@users.noreply.github.com>
Date: Sun, 18 Aug 2019 11:30:13 +0200
Subject: [PATCH] Rustup to rustc 1.39.0-nightly (2111aed0a 2019-08-17)

---
 build_sysroot/build_sysroot.sh | 4 ++--
 src/base.rs                    | 1 -
 src/constant.rs                | 3 +--
 src/intrinsics.rs              | 8 ++++----
 src/main_shim.rs               | 2 +-
 src/num.rs                     | 2 +-
 6 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/build_sysroot/build_sysroot.sh b/build_sysroot/build_sysroot.sh
index c37dd5104a85..5b3ea291e773 100755
--- a/build_sysroot/build_sysroot.sh
+++ b/build_sysroot/build_sysroot.sh
@@ -28,7 +28,7 @@ fi
 
 # Copy files to sysroot
 mkdir -p sysroot/lib/rustlib/$TARGET_TRIPLE/lib/
-cp target/$TARGET_TRIPLE/$sysroot_channel/deps/* sysroot/lib/rustlib/$TARGET_TRIPLE/lib/
+cp -r target/$TARGET_TRIPLE/$sysroot_channel/deps/* sysroot/lib/rustlib/$TARGET_TRIPLE/lib/
 
 if [[ "$1" == "--release" ]]; then
     channel='release'
@@ -39,4 +39,4 @@ else
 fi
 
 # Copy files to sysroot
-cp sysroot_src/src/libtest/target/$TARGET_TRIPLE/$sysroot_channel/deps/*  sysroot/lib/rustlib/$TARGET_TRIPLE/lib/
+cp -r sysroot_src/src/libtest/target/$TARGET_TRIPLE/$sysroot_channel/deps/*  sysroot/lib/rustlib/$TARGET_TRIPLE/lib/
diff --git a/src/base.rs b/src/base.rs
index 4af36117de02..51e6e44b59e9 100644
--- a/src/base.rs
+++ b/src/base.rs
@@ -490,7 +490,6 @@ fn trans_stmt<'a, 'tcx: 'a>(
                 alignstack, // bool
                 dialect: _, // syntax::ast::AsmDialect
                 asm_str_style: _,
-                ctxt: _,
             } = asm;
             match &*asm_code.as_str() {
                 "cpuid" | "cpuid\n" => {
diff --git a/src/constant.rs b/src/constant.rs
index 63ac186690a7..19529a79928b 100644
--- a/src/constant.rs
+++ b/src/constant.rs
@@ -154,7 +154,6 @@ fn trans_const_place<'a, 'tcx: 'a>(
         let op = ecx.eval_operand(
             &Operand::Constant(Box::new(Constant {
                 span: DUMMY_SP,
-                ty: const_.ty,
                 user_ty: None,
                 literal: const_,
             })),
@@ -391,7 +390,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for TransPlaceInterpreter {
         _: mir::BinOp,
         _: ImmTy<'tcx>,
         _: ImmTy<'tcx>,
-    ) -> InterpResult<'tcx, (Scalar, bool)> {
+    ) -> InterpResult<'tcx, (Scalar, bool, Ty<'tcx>)> {
         panic!();
     }
 
diff --git a/src/intrinsics.rs b/src/intrinsics.rs
index bd78271057c9..2dfa45c9dfb0 100644
--- a/src/intrinsics.rs
+++ b/src/intrinsics.rs
@@ -466,12 +466,12 @@ pub fn codegen_intrinsic_call<'a, 'tcx: 'a>(
             );
             ret.write_cvalue(fx, res);
         };
-        _ if intrinsic.starts_with("overflowing_"), (c x, c y) {
+        _ if intrinsic.starts_with("wrapping_"), (c x, c y) {
             assert_eq!(x.layout().ty, y.layout().ty);
             let bin_op = match intrinsic {
-                "overflowing_add" => BinOp::Add,
-                "overflowing_sub" => BinOp::Sub,
-                "overflowing_mul" => BinOp::Mul,
+                "wrapping_add" => BinOp::Add,
+                "wrapping_sub" => BinOp::Sub,
+                "wrapping_mul" => BinOp::Mul,
                 _ => unimplemented!("intrinsic {}", intrinsic),
             };
             let res = crate::num::trans_int_binop(
diff --git a/src/main_shim.rs b/src/main_shim.rs
index 1dae9e32baad..3dc3fad51f50 100644
--- a/src/main_shim.rs
+++ b/src/main_shim.rs
@@ -20,7 +20,7 @@ pub fn maybe_create_entry_wrapper(
         None => return,
     };
 
-    create_entry_fn(tcx, module, main_def_id, use_start_lang_item);;
+    create_entry_fn(tcx, module, main_def_id, use_start_lang_item);
 
     fn create_entry_fn(
         tcx: TyCtxt<'_>,
diff --git a/src/num.rs b/src/num.rs
index 1e8329007f9c..8d3bb0192180 100644
--- a/src/num.rs
+++ b/src/num.rs
@@ -310,7 +310,7 @@ pub fn trans_ptr_binop<'a, 'tcx: 'a>(
                 let lhs = in_lhs.load_scalar(fx);
                 let rhs = in_rhs.load_scalar(fx);
 
-                return codegen_compare_bin_op(fx, bin_op, false, lhs, rhs);;
+                return codegen_compare_bin_op(fx, bin_op, false, lhs, rhs);
             }
             BinOp::Offset => {
                 let (base, offset) = (in_lhs, in_rhs.load_scalar(fx));