diff options
| author | Ben Kimock <kimockb@gmail.com> | 2023-01-22 17:06:28 -0500 |
|---|---|---|
| committer | Ben Kimock <kimockb@gmail.com> | 2023-01-23 19:25:10 -0500 |
| commit | 5bfad5cc858d3b59d30da6d411449883581ff510 (patch) | |
| tree | db1f27a6c8ba169461b42407154dfe65c3839a04 /compiler/rustc_codegen_ssa/src | |
| parent | 662199f125005dca31bf9cdfa298bd5a7994e07c (diff) | |
| download | rust-5bfad5cc858d3b59d30da6d411449883581ff510.tar.gz rust-5bfad5cc858d3b59d30da6d411449883581ff510.zip | |
Thread a ParamEnv down to might_permit_raw_init
Diffstat (limited to 'compiler/rustc_codegen_ssa/src')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/mir/block.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_ssa/src/mir/block.rs b/compiler/rustc_codegen_ssa/src/mir/block.rs index 978aff511bf..c73f415ad8f 100644 --- a/compiler/rustc_codegen_ssa/src/mir/block.rs +++ b/compiler/rustc_codegen_ssa/src/mir/block.rs @@ -678,8 +678,8 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> { let layout = bx.layout_of(ty); let do_panic = match intrinsic { Inhabited => layout.abi.is_uninhabited(), - ZeroValid => !bx.tcx().permits_zero_init(layout), - MemUninitializedValid => !bx.tcx().permits_uninit_init(layout), + ZeroValid => !bx.tcx().permits_zero_init(bx.param_env().and(layout)), + MemUninitializedValid => !bx.tcx().permits_uninit_init(bx.param_env().and(layout)), }; Some(if do_panic { let msg_str = with_no_visible_paths!({ |