diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-08-29 20:49:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-29 20:49:02 +0200 |
| commit | 56d7d93a4b4e19506887d9803ec8871e31e8aa86 (patch) | |
| tree | 2a7271e993d7b8a0246f7d4bbd0080ed7375daad /compiler/rustc_codegen_gcc | |
| parent | bb90f810703af79f6d4006d455bbb6782838854b (diff) | |
| parent | 56b767322b87917ea82bad6472593efa839437f9 (diff) | |
| download | rust-56d7d93a4b4e19506887d9803ec8871e31e8aa86.tar.gz rust-56d7d93a4b4e19506887d9803ec8871e31e8aa86.zip | |
Rollup merge of #111580 - atsuzaki:layout-ice, r=oli-obk
Don't ICE on layout computation failure Fixes #111176 regression. r? `@oli-obk`
Diffstat (limited to 'compiler/rustc_codegen_gcc')
| -rw-r--r-- | compiler/rustc_codegen_gcc/src/context.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_gcc/src/context.rs b/compiler/rustc_codegen_gcc/src/context.rs index 88dcafa7370..dcebd92a61c 100644 --- a/compiler/rustc_codegen_gcc/src/context.rs +++ b/compiler/rustc_codegen_gcc/src/context.rs @@ -7,6 +7,7 @@ use rustc_codegen_ssa::traits::{ BaseTypeMethods, MiscMethods, }; +use rustc_codegen_ssa::errors as ssa_errors; use rustc_data_structures::base_n; use rustc_data_structures::fx::{FxHashMap, FxHashSet}; use rustc_middle::span_bug; @@ -479,7 +480,7 @@ impl<'gcc, 'tcx> LayoutOfHelpers<'tcx> for CodegenCx<'gcc, 'tcx> { if let LayoutError::SizeOverflow(_) | LayoutError::ReferencesError(_) = err { self.sess().emit_fatal(respan(span, err.into_diagnostic())) } else { - span_bug!(span, "failed to get layout for `{}`: {}", ty, err) + self.tcx.sess.emit_fatal(ssa_errors::FailedToGetLayout { span, ty, err }) } } } |