Auto merge of #1553 - RalfJung:rustup, r=RalfJung

bors · bors · commit 1f6ce43721bb · 2020-09-20T11:14:29.000Z
rustup

Cc `@oli-obk`
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-a3bc0e752fad96f537b73f4e9bc805a73d404f7b
+5e449b9adff463455743291b0c1f76feec092992
diff --git a/src/helpers.rs b/src/helpers.rs
@@ -59,7 +59,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
         let this = self.eval_context_mut();
         let instance = this.resolve_path(path);
         let cid = GlobalId { instance, promoted: None };
-        let const_val = this.const_eval_raw(cid)?;
+        let const_val = this.eval_to_allocation(cid)?;
         let const_val = this.read_scalar(const_val.into())?;
         return Ok(const_val);
     }

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx`
`59`	`59`	`let this = self.eval_context_mut();`
`60`	`60`	`let instance = this.resolve_path(path);`
`61`	`61`	`let cid = GlobalId { instance, promoted: None };`
`62`		`- let const_val = this.const_eval_raw(cid)?;`
	`62`	`+ let const_val = this.eval_to_allocation(cid)?;`
`63`	`63`	`let const_val = this.read_scalar(const_val.into())?;`
`64`	`64`	`return Ok(const_val);`
`65`	`65`	`}`