summaryrefslogtreecommitdiffstats
path: root/src/librustc_mir/interpret/step.rs
diff options
context:
space:
mode:
authorEduard-Mihai Burtescu <edy.burt@gmail.com>2018-01-05 05:12:38 +0200
committerEduard-Mihai Burtescu <edy.burt@gmail.com>2018-01-05 05:12:38 +0200
commit0907494ae1b310da5708d61a5ca4f20033dcc86a (patch)
tree8b6f131971fb97eff465ec5eeba4bb17f07f6d34 /src/librustc_mir/interpret/step.rs
parentAuto merge of #46916 - michaelwoerister:generate-dead-code-plz, r=alexcrichton (diff)
downloadgrust-0907494ae1b310da5708d61a5ca4f20033dcc86a.tar.gz
grust-0907494ae1b310da5708d61a5ca4f20033dcc86a.tar.bz2
grust-0907494ae1b310da5708d61a5ca4f20033dcc86a.tar.xz
miri: use AllocId instead of u64.
Diffstat (limited to 'src/librustc_mir/interpret/step.rs')
-rw-r--r--src/librustc_mir/interpret/step.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_mir/interpret/step.rs b/src/librustc_mir/interpret/step.rs
index 140da7e109..2b0f9041d5 100644
--- a/src/librustc_mir/interpret/step.rs
+++ b/src/librustc_mir/interpret/step.rs
@@ -180,7 +180,7 @@ impl<'a, 'tcx, M: Machine<'tcx>> EvalContext<'a, 'tcx, M> {
180 layout.align, 180 layout.align,
181 None, 181 None,
182 )?; 182 )?;
183 self.tcx.interpret_interner.borrow_mut().cache(cid, ptr.into()); 183 self.tcx.interpret_interner.borrow_mut().cache(cid, ptr.alloc_id);
184 let internally_mutable = !layout.ty.is_freeze(self.tcx, self.param_env, span); 184 let internally_mutable = !layout.ty.is_freeze(self.tcx, self.param_env, span);
185 let mutability = if mutability == Mutability::Mutable || internally_mutable { 185 let mutability = if mutability == Mutability::Mutable || internally_mutable {
186 Mutability::Mutable 186 Mutability::Mutable
@@ -265,7 +265,7 @@ impl<'a, 'b, 'tcx, M: Machine<'tcx>> Visitor<'tcx> for ConstantExtractor<'a, 'b,
265 layout.align, 265 layout.align,
266 None, 266 None,
267 )?; 267 )?;
268 this.ecx.tcx.interpret_interner.borrow_mut().cache(cid, ptr.into()); 268 this.ecx.tcx.interpret_interner.borrow_mut().cache(cid, ptr.alloc_id);
269 trace!("pushing stack frame for {:?}", index); 269 trace!("pushing stack frame for {:?}", index);
270 this.ecx.push_stack_frame( 270 this.ecx.push_stack_frame(
271 this.instance, 271 this.instance,