user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[MIR] Fix type of temporary for box EXPR

Browse source 
Previously the code would fail to dereference the temporary.
This commit is contained in:
Oliver Schneider 2016-01-29 15:44:16 +01:00
parent 7bd87c1f1b
commit 06ef2e72c9
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/librustc_mir/build/expr/as_rvalue.rs
View file

@ -61,16 +61,15 @@ impl<'a,'tcx> Builder<'a,'tcx> {
}
ExprKind::Box { value } => {
let value = this.hir.mirror(value);
let value_ty = value.ty.clone();
let result = this.temp(value_ty.clone());
let result = this.temp(expr.ty);
// to start, malloc some memory of suitable type (thus far, uninitialized):
let rvalue = Rvalue::Box(value.ty.clone());
let rvalue = Rvalue::Box(value.ty);
this.cfg.push_assign(block, expr_span, &result, rvalue);
// schedule a shallow free of that memory, lest we unwind:
let extent = this.extent_of_innermost_scope();
this.schedule_drop(expr_span, extent, DropKind::Free, &result, value_ty);
this.schedule_drop(expr_span, extent, DropKind::Free, &result, value.ty);
// initialize the box contents:
let contents = result.clone().deref();