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

fix the drop_in_place intrinsic for fat pointers

Browse Source
This commit is contained in:
Oliver Schneider 2016-11-04 16:37:12 +01:00
parent 0420c27c8e
commit bd6e52d831
No known key found for this signature in database
GPG Key ID: 56D6EEA0FC67AC46
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/interpreter/terminator/intrinsics.rs
View File

@ -123,9 +123,20 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
"drop_in_place" => {
let ty = substs.type_at(0);
let ptr = arg_vals[0].read_ptr(&self.memory)?;
let ptr_ty = self.tcx.mk_mut_ptr(ty);
let lvalue = match self.follow_by_ref_value(arg_vals[0], ptr_ty)? {
Value::ByRef(_) => bug!("follow_by_ref_value returned ByRef"),
Value::ByVal(ptr) => Lvalue::from_ptr(ptr.expect_ptr("drop_in_place first arg not a pointer")),
Value::ByValPair(ptr, extra) => Lvalue::Ptr {
ptr: ptr.expect_ptr("drop_in_place first arg not a pointer"),
extra: match extra.try_as_ptr() {
Some(vtable) => LvalueExtra::Vtable(vtable),
None => LvalueExtra::Length(extra.expect_uint("either pointer or not, but not neither")),
},
},
};
let mut drops = Vec::new();
self.drop(Lvalue::from_ptr(ptr), ty, &mut drops)?;
self.drop(lvalue, ty, &mut drops)?;
self.eval_drop_impls(drops)?;
}