diff options
| author | bors <bors@rust-lang.org> | 2024-11-20 06:22:01 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-11-20 06:22:01 +0000 |
| commit | 67c8877102ac38492dbd129cd4a454022a44faae (patch) | |
| tree | 4e6528de3a8bb2a978d5812d576299563e5e977b /src/base.rs | |
| parent | c5c3709d8061ace23cd529426b2aed4c6c5ba4e4 (diff) | |
| parent | bf45e9f7f39a2698ea9c494e2f73d8736c85f19c (diff) | |
Auto merge of #133212 - lcnr:questionable-uwu, r=compiler-errors
continue `ParamEnv` to `TypingEnv` transition cc #132279 r? `@compiler-errors`
Diffstat (limited to 'src/base.rs')
| -rw-r--r-- | src/base.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/base.rs b/src/base.rs index 1b91d251bfd..77ee9773940 100644 --- a/src/base.rs +++ b/src/base.rs @@ -11,7 +11,7 @@ use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags; use rustc_middle::mir::InlineAsmMacro; use rustc_middle::ty::TypeVisitableExt; use rustc_middle::ty::adjustment::PointerCoercion; -use rustc_middle::ty::layout::FnAbiOf; +use rustc_middle::ty::layout::{FnAbiOf, HasTypingEnv}; use rustc_middle::ty::print::with_no_trimmed_paths; use crate::constant::ConstantCx; @@ -841,7 +841,7 @@ fn codegen_stmt<'tcx>( lval.write_cvalue(fx, CValue::by_val(operand, box_layout)); } Rvalue::NullaryOp(ref null_op, ty) => { - assert!(lval.layout().ty.is_sized(fx.tcx, ty::ParamEnv::reveal_all())); + assert!(lval.layout().ty.is_sized(fx.tcx, fx.typing_env())); let layout = fx.layout_of(fx.monomorphize(ty)); let val = match null_op { NullOp::SizeOf => layout.size.bytes(), |