mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

constant ids are Copy now

Browse Source
This commit is contained in:
Oliver Schneider 2016-10-21 11:21:52 +02:00
parent f81c4ac91b
commit 9e9586da95
No known key found for this signature in database
GPG Key ID: 56D6EEA0FC67AC46
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/interpreter/step.rs
View File

@ -129,13 +129,13 @@ impl<'a, 'b, 'tcx> ConstantExtractor<'a, 'b, 'tcx> {
}
self.try(|this| {
let mir = this.ecx.load_mir(def_id)?;
this.ecx.statics.insert(cid.clone(), Constant::uninitialized(mir.return_ty));
this.ecx.statics.insert(cid, Constant::uninitialized(mir.return_ty));
let cleanup = if immutable && !mir.return_ty.type_contents(this.ecx.tcx).interior_unsafe() {
StackPopCleanup::Freeze
} else {
StackPopCleanup::None
};
this.ecx.push_stack_frame(def_id, span, mir, substs, Lvalue::Static(cid.clone()), cleanup)
this.ecx.push_stack_frame(def_id, span, mir, substs, Lvalue::Static(cid), cleanup)
});
}
fn try<F: FnOnce(&mut Self) -> EvalResult<'tcx, ()>>(&mut self, f: F) {
@ -178,12 +178,12 @@ impl<'a, 'b, 'tcx> Visitor<'tcx> for ConstantExtractor<'a, 'b, 'tcx> {
self.try(|this| {
let mir = CachedMir::Owned(Rc::new(mir));
let ty = this.ecx.monomorphize(mir.return_ty, this.substs);
this.ecx.statics.insert(cid.clone(), Constant::uninitialized(ty));
this.ecx.statics.insert(cid, Constant::uninitialized(ty));
this.ecx.push_stack_frame(this.def_id,
constant.span,
mir,
this.substs,
Lvalue::Static(cid.clone()),
Lvalue::Static(cid),
StackPopCleanup::Freeze)
});
}