diff options
| author | bors <bors@rust-lang.org> | 2023-05-31 05:42:26 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-05-31 05:42:26 +0000 |
| commit | 617d3d6d722c432cdcbf210e6db55c3bdeafe381 (patch) | |
| tree | 3f2161a911343bb2a4880e0b97c582d1807a216c /compiler/rustc_codegen_ssa/src | |
| parent | f51fca3af344686d734c3ff6b4399642c4f92305 (diff) | |
| parent | 77bbfbcdecae1d696da9dc7e671b33a804aa6abf (diff) | |
| download | rust-617d3d6d722c432cdcbf210e6db55c3bdeafe381.tar.gz rust-617d3d6d722c432cdcbf210e6db55c3bdeafe381.zip | |
Auto merge of #112127 - matthiaskrgr:rollup-77pt893, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #112031 (Migrate `item_proc_macro` to Askama) - #112053 (Remove `-Zcgu-partitioning-strategy`.) - #112069 (offset_of: don't require type to be `Sized`) - #112084 (enhancements on build_helper utilization and rustdoc-gui-test) - #112096 (Remove array_zip) - #112108 (Fix re-export of doc hidden item inside private item not displayed) - #112113 (rustdoc: simplify `clean` by removing `FnRetTy`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_ssa/src')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/mir/rvalue.rs | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/compiler/rustc_codegen_ssa/src/mir/rvalue.rs b/compiler/rustc_codegen_ssa/src/mir/rvalue.rs index 6e7065713b8..0255b660380 100644 --- a/compiler/rustc_codegen_ssa/src/mir/rvalue.rs +++ b/compiler/rustc_codegen_ssa/src/mir/rvalue.rs @@ -668,11 +668,16 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> { mir::Rvalue::NullaryOp(ref null_op, ty) => { let ty = self.monomorphize(ty); - assert!(bx.cx().type_is_sized(ty)); let layout = bx.cx().layout_of(ty); let val = match null_op { - mir::NullOp::SizeOf => layout.size.bytes(), - mir::NullOp::AlignOf => layout.align.abi.bytes(), + mir::NullOp::SizeOf => { + assert!(bx.cx().type_is_sized(ty)); + layout.size.bytes() + } + mir::NullOp::AlignOf => { + assert!(bx.cx().type_is_sized(ty)); + layout.align.abi.bytes() + } mir::NullOp::OffsetOf(fields) => { layout.offset_of_subfield(bx.cx(), fields.iter().map(|f| f.index())).bytes() } |
