diff options
| author | bors <bors@rust-lang.org> | 2023-01-26 03:10:52 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-01-26 03:10:52 +0000 |
| commit | 885bf628879310b885721e1fdd91ea2cbca9311f (patch) | |
| tree | eab86e1cccf55fb17843111cd9d66186de95db78 /compiler/rustc_codegen_ssa/src/mir | |
| parent | 2a17174ee639f8e0a3cee307d5685d38beb474ba (diff) | |
| parent | 5bfad5cc858d3b59d30da6d411449883581ff510 (diff) | |
| download | rust-885bf628879310b885721e1fdd91ea2cbca9311f.tar.gz rust-885bf628879310b885721e1fdd91ea2cbca9311f.zip | |
Auto merge of #105582 - saethlin:instcombine-assert-inhabited, r=cjgillot
InstCombine away intrinsic validity assertions This optimization (currently) fires 246 times on the standard library. It seems to fire hardly at all on the big crates in the benchmark suite. Interesting.
Diffstat (limited to 'compiler/rustc_codegen_ssa/src/mir')
| -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!({ |