Rvalue::InitBox prototype

nbdd0121 · nbdd0121 · commit c8a2f53f44aa · 2021-09-06T21:58:36.000+01:00
diff --git a/compiler/rustc_codegen_ssa/src/mir/rvalue.rs b/compiler/rustc_codegen_ssa/src/mir/rvalue.rs
@@ -544,6 +544,18 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
                     OperandRef::new_zst(&mut bx, self.cx.layout_of(self.monomorphize(ty)));
                 (bx, operand)
             }
+            mir::Rvalue::InitBox(ref operand, content_ty) => {
+                let operand = self.codegen_operand(&mut bx, operand);
+                let lloperand = operand.immediate();
+
+                let content_ty = self.monomorphize(content_ty);
+                let box_layout = bx.cx().layout_of(bx.tcx().mk_box(content_ty));
+                let llty_ptr = bx.cx().backend_type(box_layout);
+
+                let val = bx.pointercast(lloperand, llty_ptr);
+                let operand = OperandRef { val: OperandValue::Immediate(val), layout: box_layout };
+                (bx, operand)
+            }
         }
     }
 
@@ -757,6 +769,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
             mir::Rvalue::AddressOf(..) |
             mir::Rvalue::Len(..) |
             mir::Rvalue::Cast(..) | // (*)
+            mir::Rvalue::InitBox(..) | // (*)
             mir::Rvalue::BinaryOp(..) |
             mir::Rvalue::CheckedBinaryOp(..) |
             mir::Rvalue::UnaryOp(..) |
diff --git a/compiler/rustc_hir/src/lang_items.rs b/compiler/rustc_hir/src/lang_items.rs
@@ -294,6 +294,7 @@ language_item_table! {
     BeginPanicFmt,           sym::begin_panic_fmt,     begin_panic_fmt,            Target::Fn,             GenericRequirement::None;
 
     ExchangeMalloc,          sym::exchange_malloc,     exchange_malloc_fn,         Target::Fn,             GenericRequirement::None;
+    BoxNew,                  sym::box_new,             box_new_fn,                 Target::Fn,             GenericRequirement::Minimum(1);
     BoxFree,                 sym::box_free,            box_free_fn,                Target::Fn,             GenericRequirement::Minimum(1);
     DropInPlace,             sym::drop_in_place,       drop_in_place_fn,           Target::Fn,             GenericRequirement::Minimum(1);
     Oom,                     sym::oom,                 oom,                        Target::Fn,             GenericRequirement::None;
diff --git a/compiler/rustc_middle/src/mir/mod.rs b/compiler/rustc_middle/src/mir/mod.rs
@@ -2170,6 +2170,8 @@ pub enum Rvalue<'tcx> {
     /// that `Foo` has a destructor. These rvalues can be optimized
     /// away after type-checking and before lowering.
     Aggregate(Box<AggregateKind<'tcx>>, Vec<Operand<'tcx>>),
+
+    InitBox(Operand<'tcx>, Ty<'tcx>),
 }
 
 #[cfg(target_arch = "x86_64")]
@@ -2418,6 +2420,10 @@ impl<'tcx> Debug for Rvalue<'tcx> {
                     }),
                 }
             }
+
+            InitBox(ref place, ref ty) => {
+                write!(fmt, "{:?} as box {:?}", place, ty)
+            }
         }
     }
 }
diff --git a/compiler/rustc_middle/src/mir/tcx.rs b/compiler/rustc_middle/src/mir/tcx.rs
@@ -206,6 +206,7 @@ impl<'tcx> Rvalue<'tcx> {
                     tcx.mk_generator(did, substs, movability)
                 }
             },
+            Rvalue::InitBox(_, ty) => tcx.mk_box(ty),
         }
     }
 
@@ -215,6 +216,7 @@ impl<'tcx> Rvalue<'tcx> {
     pub fn initialization_state(&self) -> RvalueInitializationState {
         match *self {
             Rvalue::NullaryOp(NullOp::Box, _) => RvalueInitializationState::Shallow,
+            Rvalue::InitBox(_, _) => RvalueInitializationState::Shallow,
             _ => RvalueInitializationState::Deep,
         }
     }
diff --git a/compiler/rustc_middle/src/mir/type_foldable.rs b/compiler/rustc_middle/src/mir/type_foldable.rs
@@ -210,6 +210,7 @@ impl<'tcx> TypeFoldable<'tcx> for Rvalue<'tcx> {
                 });
                 Aggregate(kind, fields.fold_with(folder))
             }
+            InitBox(op, ty) => InitBox(op.fold_with(folder), ty.fold_with(folder)),
         }
     }
 
@@ -255,6 +256,10 @@ impl<'tcx> TypeFoldable<'tcx> for Rvalue<'tcx> {
                 }
                 fields.visit_with(visitor)
             }
+            InitBox(ref op, ty) => {
+                op.visit_with(visitor)?;
+                ty.visit_with(visitor)
+            }
         }
     }
 }
diff --git a/compiler/rustc_middle/src/mir/visit.rs b/compiler/rustc_middle/src/mir/visit.rs
@@ -753,6 +753,11 @@ macro_rules! make_mir_visitor {
                             self.visit_operand(operand, location);
                         }
                     }
+
+                    Rvalue::InitBox(operand, ty) => {
+                        self.visit_operand(operand, location);
+                        self.visit_ty(ty, TyContext::Location(location));
+                    }
                 }
             }
 
diff --git a/compiler/rustc_mir/src/borrow_check/invalidation.rs b/compiler/rustc_mir/src/borrow_check/invalidation.rs
@@ -318,9 +318,8 @@ impl<'cx, 'tcx> InvalidationGenerator<'cx, 'tcx> {
             Rvalue::Use(ref operand)
             | Rvalue::Repeat(ref operand, _)
             | Rvalue::UnaryOp(_ /*un_op*/, ref operand)
-            | Rvalue::Cast(_ /*cast_kind*/, ref operand, _ /*ty*/) => {
-                self.consume_operand(location, operand)
-            }
+            | Rvalue::Cast(_ /*cast_kind*/, ref operand, _ /*ty*/)
+            | Rvalue::InitBox(ref operand, _ /*ty*/) => self.consume_operand(location, operand),
 
             Rvalue::Len(place) | Rvalue::Discriminant(place) => {
                 let af = match *rvalue {
diff --git a/compiler/rustc_mir/src/borrow_check/mod.rs b/compiler/rustc_mir/src/borrow_check/mod.rs
@@ -1341,7 +1341,8 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
             Rvalue::Use(ref operand)
             | Rvalue::Repeat(ref operand, _)
             | Rvalue::UnaryOp(_ /*un_op*/, ref operand)
-            | Rvalue::Cast(_ /*cast_kind*/, ref operand, _ /*ty*/) => {
+            | Rvalue::Cast(_ /*cast_kind*/, ref operand, _ /*ty*/)
+            | Rvalue::InitBox(ref operand, _ /*ty*/) => {
                 self.consume_operand(location, (operand, span), flow_state)
             }
 
diff --git a/compiler/rustc_mir/src/borrow_check/type_check/mod.rs b/compiler/rustc_mir/src/borrow_check/type_check/mod.rs
@@ -2320,6 +2320,25 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
                 }
             }
 
+            Rvalue::InitBox(_, ty) => {
+                // Even with unsized locals cannot box an unsized value.
+                if self.unsized_feature_enabled() {
+                    let span = body.source_info(location).span;
+                    self.ensure_place_sized(ty, span);
+                }
+
+                let trait_ref = ty::TraitRef {
+                    def_id: tcx.require_lang_item(LangItem::Sized, Some(self.last_span)),
+                    substs: tcx.mk_substs_trait(ty, &[]),
+                };
+
+                self.prove_trait_ref(
+                    trait_ref,
+                    location.to_locations(),
+                    ConstraintCategory::SizedBound,
+                );
+            }
+
             Rvalue::AddressOf(..)
             | Rvalue::ThreadLocalRef(..)
             | Rvalue::Use(..)
@@ -2343,6 +2362,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
             | Rvalue::AddressOf(..)
             | Rvalue::Len(..)
             | Rvalue::Cast(..)
+            | Rvalue::InitBox(..)
             | Rvalue::BinaryOp(..)
             | Rvalue::CheckedBinaryOp(..)
             | Rvalue::NullaryOp(..)
diff --git a/compiler/rustc_mir/src/dataflow/impls/borrowed_locals.rs b/compiler/rustc_mir/src/dataflow/impls/borrowed_locals.rs
@@ -169,6 +169,7 @@ where
             }
 
             mir::Rvalue::Cast(..)
+            | mir::Rvalue::InitBox(..)
             | mir::Rvalue::Use(..)
             | mir::Rvalue::ThreadLocalRef(..)
             | mir::Rvalue::Repeat(..)
diff --git a/compiler/rustc_mir/src/dataflow/move_paths/builder.rs b/compiler/rustc_mir/src/dataflow/move_paths/builder.rs
@@ -327,6 +327,7 @@ impl<'b, 'a, 'tcx> Gatherer<'b, 'a, 'tcx> {
             Rvalue::Use(ref operand)
             | Rvalue::Repeat(ref operand, _)
             | Rvalue::Cast(_, ref operand, _)
+            | Rvalue::InitBox(ref operand, _)
             | Rvalue::UnaryOp(_, ref operand) => self.gather_operand(operand),
             Rvalue::BinaryOp(ref _binop, box (ref lhs, ref rhs))
             | Rvalue::CheckedBinaryOp(ref _binop, box (ref lhs, ref rhs)) => {
diff --git a/compiler/rustc_mir/src/interpret/step.rs b/compiler/rustc_mir/src/interpret/step.rs
@@ -284,6 +284,12 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
                 self.write_scalar(Scalar::from_machine_usize(layout.size.bytes(), self), &dest)?;
             }
 
+            InitBox(ref operand, _) => {
+                let src = self.eval_operand(operand, None)?;
+                let v = self.read_immediate(&src)?;
+                self.write_immediate(*v, &dest)?;
+            }
+
             Cast(cast_kind, ref operand, cast_ty) => {
                 let src = self.eval_operand(operand, None)?;
                 let cast_ty = self.subst_from_current_frame_and_normalize_erasing_regions(cast_ty);
diff --git a/compiler/rustc_mir/src/transform/check_consts/check.rs b/compiler/rustc_mir/src/transform/check_consts/check.rs
@@ -650,6 +650,7 @@ impl Visitor<'tcx> for Checker<'mir, 'tcx> {
 
             Rvalue::NullaryOp(NullOp::SizeOf, _) => {}
             Rvalue::NullaryOp(NullOp::Box, _) => self.check_op(ops::HeapAllocation),
+            Rvalue::InitBox(_, _) => {}
 
             Rvalue::UnaryOp(_, ref operand) => {
                 let ty = operand.ty(self.body, self.tcx);
@@ -899,6 +900,12 @@ impl Visitor<'tcx> for Checker<'mir, 'tcx> {
                     return;
                 }
 
+                let is_box_new = Some(callee) == tcx.lang_items().box_new_fn();
+                if is_box_new {
+                    self.check_op(ops::HeapAllocation);
+                    return;
+                }
+
                 // `async` blocks get lowered to `std::future::from_generator(/* a closure */)`.
                 let is_async_block = Some(callee) == tcx.lang_items().from_generator_fn();
                 if is_async_block {
diff --git a/compiler/rustc_mir/src/transform/check_consts/qualifs.rs b/compiler/rustc_mir/src/transform/check_consts/qualifs.rs
@@ -166,7 +166,8 @@ where
         Rvalue::Use(operand)
         | Rvalue::Repeat(operand, _)
         | Rvalue::UnaryOp(_, operand)
-        | Rvalue::Cast(_, operand, _) => in_operand::<Q, _>(cx, in_local, operand),
+        | Rvalue::Cast(_, operand, _)
+        | Rvalue::InitBox(operand, _) => in_operand::<Q, _>(cx, in_local, operand),
 
         Rvalue::BinaryOp(_, box (lhs, rhs)) | Rvalue::CheckedBinaryOp(_, box (lhs, rhs)) => {
             in_operand::<Q, _>(cx, in_local, lhs) || in_operand::<Q, _>(cx, in_local, rhs)
diff --git a/compiler/rustc_mir/src/transform/const_prop.rs b/compiler/rustc_mir/src/transform/const_prop.rs
@@ -723,6 +723,7 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> {
             | Rvalue::Repeat(..)
             | Rvalue::Len(..)
             | Rvalue::Cast(..)
+            | Rvalue::InitBox(..)
             | Rvalue::Discriminant(..)
             | Rvalue::NullaryOp(..) => {}
         }
diff --git a/compiler/rustc_mir/src/transform/dest_prop.rs b/compiler/rustc_mir/src/transform/dest_prop.rs
@@ -969,6 +969,7 @@ impl<'tcx> Visitor<'tcx> for BorrowCollector {
             }
 
             Rvalue::Cast(..)
+            | Rvalue::InitBox(..)
             | Rvalue::Use(..)
             | Rvalue::Repeat(..)
             | Rvalue::Len(..)
diff --git a/compiler/rustc_mir/src/transform/promote_consts.rs b/compiler/rustc_mir/src/transform/promote_consts.rs
@@ -522,6 +522,8 @@ impl<'tcx> Validator<'_, 'tcx> {
                 NullOp::SizeOf => {}
             },
 
+            Rvalue::InitBox(_, _) => return Err(Unpromotable),
+
             Rvalue::UnaryOp(op, operand) => {
                 match op {
                     // These operations can never fail.
diff --git a/compiler/rustc_mir/src/transform/separate_const_switch.rs b/compiler/rustc_mir/src/transform/separate_const_switch.rs
@@ -204,6 +204,7 @@ fn is_likely_const<'tcx>(mut tracked_place: Place<'tcx>, block: &BasicBlockData<
                         | Rvalue::AddressOf(_, _)
                         | Rvalue::Cast(_, Operand::Constant(_), _)
                         | Rvalue::NullaryOp(_, _)
+                        | Rvalue::InitBox(_, _)
                         | Rvalue::UnaryOp(_, Operand::Constant(_)) => return true,
 
                         // These rvalues make things ambiguous
@@ -301,6 +302,7 @@ fn find_determining_place<'tcx>(
                     | Rvalue::ThreadLocalRef(_)
                     | Rvalue::AddressOf(_, _)
                     | Rvalue::NullaryOp(_, _)
+                    | Rvalue::InitBox(_, _)
                     | Rvalue::UnaryOp(_, Operand::Constant(_))
                     | Rvalue::Cast(_, Operand::Constant(_), _)
                     => return None,
diff --git a/compiler/rustc_mir_build/src/build/expr/as_rvalue.rs b/compiler/rustc_mir_build/src/build/expr/as_rvalue.rs
@@ -5,6 +5,7 @@ use rustc_index::vec::Idx;
 use crate::build::expr::as_place::PlaceBase;
 use crate::build::expr::category::{Category, RvalueFunc};
 use crate::build::{BlockAnd, BlockAndExtension, Builder};
+use rustc_hir::lang_items::LangItem;
 use rustc_middle::middle::region;
 use rustc_middle::mir::AssertKind;
 use rustc_middle::mir::Place;
@@ -88,6 +89,39 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
             }
             ExprKind::Box { value } => {
                 let value = &this.thir[value];
+                let tcx = this.tcx;
+
+                let u8_ptr = tcx.mk_mut_ptr(tcx.mk_mach_uint(ty::UintTy::U8));
+                let storage = this.local_decls.push(LocalDecl::new(u8_ptr, expr_span).internal());
+                this.cfg.push(
+                    block,
+                    Statement { source_info, kind: StatementKind::StorageLive(storage) },
+                );
+
+                let box_new = tcx.require_lang_item(LangItem::BoxNew, Some(source_info.span));
+                let box_new = Operand::function_handle(
+                    tcx,
+                    box_new,
+                    tcx.mk_substs([value.ty.into()].iter()),
+                    source_info.span,
+                );
+
+                let success = this.cfg.start_new_block();
+                this.cfg.terminate(
+                    block,
+                    source_info,
+                    TerminatorKind::Call {
+                        func: box_new,
+                        args: Vec::new(),
+                        destination: Some((Place::from(storage), success)),
+                        cleanup: None,
+                        from_hir_call: false,
+                        fn_span: source_info.span,
+                    },
+                );
+                this.diverge_from(block);
+                block = success;
+
                 // The `Box<T>` temporary created here is not a part of the HIR,
                 // and therefore is not considered during generator auto-trait
                 // determination. See the comment about `box` at `yield_in_scope`.
@@ -102,7 +136,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                 }
 
                 // malloc some memory of suitable type (thus far, uninitialized):
-                let box_ = Rvalue::NullaryOp(NullOp::Box, value.ty);
+                let box_ = Rvalue::InitBox(Operand::Move(Place::from(storage)), value.ty);
                 this.cfg.push_assign(block, source_info, Place::from(result), box_);
 
                 // initialize the box contents:
diff --git a/compiler/rustc_span/src/symbol.rs b/compiler/rustc_span/src/symbol.rs
@@ -364,6 +364,7 @@ symbols! {
         borrowck_graphviz_postflow,
         borrowck_graphviz_preflow,
         box_free,
+        box_new,
         box_patterns,
         box_syntax,
         bpf_target_feature,
diff --git a/library/alloc/src/alloc.rs b/library/alloc/src/alloc.rs
@@ -319,6 +319,18 @@ unsafe fn exchange_malloc(size: usize, align: usize) -> *mut u8 {
     }
 }
 
+#[cfg(not(bootstrap))]
+#[cfg(all(not(no_global_oom_handling), not(test)))]
+#[lang = "box_new"]
+#[inline]
+pub(crate) fn box_new<T>() -> *mut u8 {
+    let layout = Layout::new::<T>();
+    match Global.allocate(layout) {
+        Ok(ptr) => ptr.as_mut_ptr(),
+        Err(_) => handle_alloc_error(layout),
+    }
+}
+
 #[cfg_attr(not(test), lang = "box_free")]
 #[inline]
 // This signature has to be the same as `Box`, otherwise an ICE will happen.

Original file line number	Diff line number	Diff line change
`@@ -2170,6 +2170,8 @@ pub enum Rvalue<'tcx> {`
`2170`	`2170`	/// that `Foo` has a destructor. These rvalues can be optimized
`2171`	`2171`	`/// away after type-checking and before lowering.`
`2172`	`2172`	`Aggregate(Box<AggregateKind<'tcx>>, Vec<Operand<'tcx>>),`
	`2173`	`+`
	`2174`	`+ InitBox(Operand<'tcx>, Ty<'tcx>),`
`2173`	`2175`	`}`
`2174`	`2176`
`2175`	`2177`	`#[cfg(target_arch = "x86_64")]`
`@@ -2418,6 +2420,10 @@ impl<'tcx> Debug for Rvalue<'tcx> {`
`2418`	`2420`	`}),`
`2419`	`2421`	`}`
`2420`	`2422`	`}`
	`2423`	`+`
	`2424`	`+ InitBox(ref place, ref ty) => {`
	`2425`	`+ write!(fmt, "{:?} as box {:?}", place, ty)`
	`2426`	`+ }`
`2421`	`2427`	`}`
`2422`	`2428`	`}`
`2423`	`2429`	`}`
Original file line number	Diff line number	Diff line change
`@@ -206,6 +206,7 @@ impl<'tcx> Rvalue<'tcx> {`
`206`	`206`	`tcx.mk_generator(did, substs, movability)`
`207`	`207`	`}`
`208`	`208`	`},`
	`209`	`+ Rvalue::InitBox(_, ty) => tcx.mk_box(ty),`
`209`	`210`	`}`
`210`	`211`	`}`
`211`	`212`
`@@ -215,6 +216,7 @@ impl<'tcx> Rvalue<'tcx> {`
`215`	`216`	`pub fn initialization_state(&self) -> RvalueInitializationState {`
`216`	`217`	`match *self {`
`217`	`218`	`Rvalue::NullaryOp(NullOp::Box, _) => RvalueInitializationState::Shallow,`
	`219`	`+ Rvalue::InitBox(_, _) => RvalueInitializationState::Shallow,`
`218`	`220`	`_ => RvalueInitializationState::Deep,`
`219`	`221`	`}`
`220`	`222`	`}`
Original file line number	Diff line number	Diff line change
`@@ -210,6 +210,7 @@ impl<'tcx> TypeFoldable<'tcx> for Rvalue<'tcx> {`
`210`	`210`	`});`
`211`	`211`	`Aggregate(kind, fields.fold_with(folder))`
`212`	`212`	`}`
	`213`	`+ InitBox(op, ty) => InitBox(op.fold_with(folder), ty.fold_with(folder)),`
`213`	`214`	`}`
`214`	`215`	`}`
`215`	`216`
`@@ -255,6 +256,10 @@ impl<'tcx> TypeFoldable<'tcx> for Rvalue<'tcx> {`
`255`	`256`	`}`
`256`	`257`	`fields.visit_with(visitor)`
`257`	`258`	`}`
	`259`	`+ InitBox(ref op, ty) => {`
	`260`	`+ op.visit_with(visitor)?;`
	`261`	`+ ty.visit_with(visitor)`
	`262`	`+ }`
`258`	`263`	`}`
`259`	`264`	`}`
`260`	`265`	`}`
Original file line number	Diff line number	Diff line change
`@@ -753,6 +753,11 @@ macro_rules! make_mir_visitor {`
`753`	`753`	`self.visit_operand(operand, location);`
`754`	`754`	`}`
`755`	`755`	`}`
	`756`	`+`
	`757`	`+ Rvalue::InitBox(operand, ty) => {`
	`758`	`+ self.visit_operand(operand, location);`
	`759`	`+ self.visit_ty(ty, TyContext::Location(location));`
	`760`	`+ }`
`756`	`761`	`}`
`757`	`762`	`}`
`758`	`763`
Original file line number	Diff line number	Diff line change
`@@ -1341,7 +1341,8 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {`
`1341`	`1341`	`Rvalue::Use(ref operand)`
`1342`	`1342`	`\| Rvalue::Repeat(ref operand, _)`
`1343`	`1343`	`\| Rvalue::UnaryOp(_ /un_op/, ref operand)`
`1344`		`- \| Rvalue::Cast(_ /cast_kind/, ref operand, _ /ty/) => {`
	`1344`	`+ \| Rvalue::Cast(_ /cast_kind/, ref operand, _ /ty/)`
	`1345`	`+ \| Rvalue::InitBox(ref operand, _ /ty/) => {`
`1345`	`1346`	`self.consume_operand(location, (operand, span), flow_state)`
`1346`	`1347`	`}`
`1347`	`1348`
Original file line number	Diff line number	Diff line change
`@@ -169,6 +169,7 @@ where`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`mir::Rvalue::Cast(..)`
	`172`	`+ \| mir::Rvalue::InitBox(..)`
`172`	`173`	`\| mir::Rvalue::Use(..)`
`173`	`174`	`\| mir::Rvalue::ThreadLocalRef(..)`
`174`	`175`	`\| mir::Rvalue::Repeat(..)`