From 6181b29f5d9e81eb16826825da4a679e5da3f57a Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Wed, 21 Nov 2018 09:52:31 +0100 Subject: [PATCH 1/2] bump Rust --- rust-version | 2 +- src/fn_call.rs | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/rust-version b/rust-version index dcd90feeda81..a3718d44da91 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -nightly-2018-11-20 +nightly-2018-11-21 diff --git a/src/fn_call.rs b/src/fn_call.rs index 509db0355e2b..5fc706c04d80 100644 --- a/src/fn_call.rs +++ b/src/fn_call.rs @@ -469,10 +469,9 @@ impl<'a, 'mir, 'tcx: 'mir + 'a> EvalContextExt<'tcx, 'mir> for super::MiriEvalCo instance, promoted: None, }; - let const_val = self.const_eval(cid)?; - let value = const_val.unwrap_bits( - self.tcx.tcx, - ty::ParamEnv::empty().and(self.tcx.types.i32)) as i32; + let const_val = self.const_eval_raw(cid)?; + let const_val = self.read_scalar(const_val.into())?; + let value = const_val.to_i32()?; if value == name { result = Some(path_value); break; From 0b7625a0794b9997cdd60dcc5957d8991212b86b Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Wed, 21 Nov 2018 10:19:00 +0100 Subject: [PATCH 2/2] make sure compile-fail tests would compile if we screw up --- .../stacked_borrows/box_exclusive_violation1.rs | 2 +- .../stacked_borrows/mut_exclusive_violation1.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/compile-fail-fullmir/stacked_borrows/box_exclusive_violation1.rs b/tests/compile-fail-fullmir/stacked_borrows/box_exclusive_violation1.rs index 73631173b932..bd0fec859d8f 100644 --- a/tests/compile-fail-fullmir/stacked_borrows/box_exclusive_violation1.rs +++ b/tests/compile-fail-fullmir/stacked_borrows/box_exclusive_violation1.rs @@ -25,5 +25,5 @@ fn unknown_code_2() { unsafe { } } fn main() { - assert_eq!(demo_mut_advanced_unique(Box::new(0)), 5); + demo_mut_advanced_unique(Box::new(0)); } diff --git a/tests/compile-fail-fullmir/stacked_borrows/mut_exclusive_violation1.rs b/tests/compile-fail-fullmir/stacked_borrows/mut_exclusive_violation1.rs index 255e35b14558..fec699e35bcf 100644 --- a/tests/compile-fail-fullmir/stacked_borrows/mut_exclusive_violation1.rs +++ b/tests/compile-fail-fullmir/stacked_borrows/mut_exclusive_violation1.rs @@ -25,5 +25,5 @@ fn unknown_code_2() { unsafe { } } fn main() { - assert_eq!(demo_mut_advanced_unique(&mut 0), 5); + demo_mut_advanced_unique(&mut 0); }