diff options
| author | bors <bors@rust-lang.org> | 2023-08-29 19:24:47 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-08-29 19:24:47 +0000 |
| commit | 83995f320c13c05a70b460ac1cf5d9d87b497f1e (patch) | |
| tree | e37956c3fdc946a63603bb8760169f76be994490 /compiler/rustc_codegen_llvm | |
| parent | b2515fa741eea89b82a2c94048f934bbcbd3bd48 (diff) | |
| parent | a644f3716325a18c971d940c97b0c56bb5215ca4 (diff) | |
| download | rust-83995f320c13c05a70b460ac1cf5d9d87b497f1e.tar.gz rust-83995f320c13c05a70b460ac1cf5d9d87b497f1e.zip | |
Auto merge of #115354 - matthiaskrgr:rollup-4cotcxz, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #111580 (Don't ICE on layout computation failure) - #114923 (doc: update lld-flavor ref) - #115174 (tests: add test for #67992) - #115187 (Add new interface to smir) - #115300 (Tweaks and improvements on SMIR around generics_of and predicates_of) - #115340 (some more is_zst that should be is_1zst) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/context.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/context.rs b/compiler/rustc_codegen_llvm/src/context.rs index 24fd5bbf8c5..8e8290279ab 100644 --- a/compiler/rustc_codegen_llvm/src/context.rs +++ b/compiler/rustc_codegen_llvm/src/context.rs @@ -10,6 +10,7 @@ use crate::value::Value; use cstr::cstr; use rustc_codegen_ssa::base::{wants_msvc_seh, wants_wasm_eh}; +use rustc_codegen_ssa::errors as ssa_errors; use rustc_codegen_ssa::traits::*; use rustc_data_structures::base_n; use rustc_data_structures::fx::FxHashMap; @@ -1000,7 +1001,7 @@ impl<'tcx> LayoutOfHelpers<'tcx> for CodegenCx<'_, 'tcx> { if let LayoutError::SizeOverflow(_) | LayoutError::ReferencesError(_) = err { self.sess().emit_fatal(Spanned { span, node: 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 }) } } } |
