diff options
| author | bors <bors@rust-lang.org> | 2023-02-15 20:56:07 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-02-15 20:56:07 +0000 |
| commit | 9b99a58301268f2c5fabe396006c0198cc4b5824 (patch) | |
| tree | a99585f9e41946e87c121f20cbd5a6e66a45c719 | |
| parent | 14bc2e60c236d3b349142cda071cafc9ceee2d3a (diff) | |
| parent | c75610891d8910d350e537acea82571d21d8cf9d (diff) | |
| download | rust-9b99a58301268f2c5fabe396006c0198cc4b5824.tar.gz rust-9b99a58301268f2c5fabe396006c0198cc4b5824.zip | |
Auto merge of #108012 - compiler-errors:issue-107999, r=oli-obk
Don't ICE in `might_permit_raw_init` if reference is polymorphic Emitting optimized MIR for a polymorphic function may require computing layout of a type that isn't (yet) known. This happens in the instcombine pass, for example. Let's fail gracefully in that condition. cc `@saethlin` fixes #107999
| -rw-r--r-- | src/intrinsics/mod.rs | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/intrinsics/mod.rs b/src/intrinsics/mod.rs index 892e7c30e2f..0d2367c2f83 100644 --- a/src/intrinsics/mod.rs +++ b/src/intrinsics/mod.rs @@ -640,7 +640,8 @@ fn codegen_regular_intrinsic_call<'tcx>( sym::assert_inhabited | sym::assert_zero_valid | sym::assert_mem_uninitialized_valid => { intrinsic_args!(fx, args => (); intrinsic); - let layout = fx.layout_of(substs.type_at(0)); + let ty = substs.type_at(0); + let layout = fx.layout_of(ty); if layout.abi.is_uninhabited() { with_no_trimmed_paths!({ crate::base::codegen_panic_nounwind( @@ -653,7 +654,10 @@ fn codegen_regular_intrinsic_call<'tcx>( } if intrinsic == sym::assert_zero_valid - && !fx.tcx.permits_zero_init(fx.param_env().and(layout)) + && !fx + .tcx + .permits_zero_init(fx.param_env().and(ty)) + .expect("expected to have layout during codegen") { with_no_trimmed_paths!({ crate::base::codegen_panic_nounwind( @@ -669,7 +673,10 @@ fn codegen_regular_intrinsic_call<'tcx>( } if intrinsic == sym::assert_mem_uninitialized_valid - && !fx.tcx.permits_uninit_init(fx.param_env().and(layout)) + && !fx + .tcx + .permits_uninit_init(fx.param_env().and(ty)) + .expect("expected to have layout during codegen") { with_no_trimmed_paths!({ crate::base::codegen_panic_nounwind( |