diff options
| author | Michael Goulet <michael@errs.io> | 2023-02-14 00:59:40 +0000 |
|---|---|---|
| committer | Michael Goulet <michael@errs.io> | 2023-02-14 22:37:30 +0000 |
| commit | c75610891d8910d350e537acea82571d21d8cf9d (patch) | |
| tree | 59f65f64694f7b6989ab92fc56db32daffa1d868 | |
| parent | 56951e4f2b136fbf8b6a93fd1577779855052a62 (diff) | |
| download | rust-c75610891d8910d350e537acea82571d21d8cf9d.tar.gz rust-c75610891d8910d350e537acea82571d21d8cf9d.zip | |
Make permit_uninit/zero_init fallible
| -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( |