From 06ef2e72c9724e89057f9d3a9ba50e1ce78da40d Mon Sep 17 00:00:00 2001 From: Oliver Schneider Date: Fri, 29 Jan 2016 15:44:16 +0100 Subject: [PATCH] [MIR] Fix type of temporary for `box EXPR` Previously the code would fail to dereference the temporary. --- src/librustc_mir/build/expr/as_rvalue.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/librustc_mir/build/expr/as_rvalue.rs b/src/librustc_mir/build/expr/as_rvalue.rs index c389e8e73309..e556d707a2d4 100644 --- a/src/librustc_mir/build/expr/as_rvalue.rs +++ b/src/librustc_mir/build/expr/as_rvalue.rs @@ -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();