From b0baa151b29d59b7bc6d7917503774a2416a5b4c Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sun, 20 Sep 2020 13:13:57 +0200 Subject: [PATCH] rustup --- rust-version | 2 +- src/helpers.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rust-version b/rust-version index 37be5591da6e..3126a8a9128d 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -a3bc0e752fad96f537b73f4e9bc805a73d404f7b +5e449b9adff463455743291b0c1f76feec092992 diff --git a/src/helpers.rs b/src/helpers.rs index 5bb620b563d3..abf128ff3e2d 100644 --- 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); }