about summary refs log tree commit diff
path: root/src/librustc_mir/transform
diff options
context:
space:
mode:
authorRalf Jung <post@ralfj.de>2018-11-06 16:16:27 +0100
committerRalf Jung <post@ralfj.de>2018-11-19 22:42:46 +0100
commitba82f54b04f429d29b0d7c5aebbae2addd5669fd (patch)
tree0c78ea550c8eb39ebd277dcbdb2495c0a0d08276 /src/librustc_mir/transform
parentb50c1b243e09284b7bbfb81c1819d358d024168d (diff)
downloadrust-ba82f54b04f429d29b0d7c5aebbae2addd5669fd.tar.gz
rust-ba82f54b04f429d29b0d7c5aebbae2addd5669fd.zip
use RawConst in miri
Diffstat (limited to 'src/librustc_mir/transform')
-rw-r--r--src/librustc_mir/transform/const_prop.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/librustc_mir/transform/const_prop.rs b/src/librustc_mir/transform/const_prop.rs
index 6b8233c941e..661ca4773b4 100644
--- a/src/librustc_mir/transform/const_prop.rs
+++ b/src/librustc_mir/transform/const_prop.rs
@@ -29,7 +29,9 @@ use rustc::ty::layout::{
 };
 
 use interpret::{self, EvalContext, ScalarMaybeUndef, Immediate, OpTy, MemoryKind};
-use const_eval::{CompileTimeInterpreter, error_to_const_error, eval_promoted, mk_borrowck_eval_cx};
+use const_eval::{
+    CompileTimeInterpreter, const_to_op, error_to_const_error, eval_promoted, mk_borrowck_eval_cx
+};
 use transform::{MirPass, MirSource};
 
 pub struct ConstProp;
@@ -262,7 +264,7 @@ impl<'a, 'mir, 'tcx> ConstPropagator<'a, 'mir, 'tcx> {
         source_info: SourceInfo,
     ) -> Option<Const<'tcx>> {
         self.ecx.tcx.span = source_info.span;
-        match self.ecx.const_to_op(c.literal) {
+        match const_to_op(&self.ecx, c.literal) {
             Ok(op) => {
                 Some((op, c.span))
             },