diff options
| author | bors <bors@rust-lang.org> | 2023-08-04 20:31:40 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-08-04 20:31:40 +0000 |
| commit | e4c14468460b22ac7a289a422fb7fee606e12a0b (patch) | |
| tree | f5a77f6bab2490a16af79582536a9d6ca6fd1168 /compiler/rustc_codegen_llvm/src | |
| parent | fe896efa974ea759b10b9754234ae61e9cab28b3 (diff) | |
| parent | 35b271306f5d5912a3440238dbe9888062fe9e24 (diff) | |
| download | rust-e4c14468460b22ac7a289a422fb7fee606e12a0b.tar.gz rust-e4c14468460b22ac7a289a422fb7fee606e12a0b.zip | |
Auto merge of #114481 - matthiaskrgr:rollup-58pczpl, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #113945 (Fix wrong span for trait selection failure error reporting) - #114351 ([rustc_span][perf] Remove unnecessary string joins and allocs.) - #114418 (bump parking_lot to 0.12) - #114434 (Improve spans for indexing expressions) - #114450 (Fix ICE failed to get layout for ReferencesError) - #114461 (Fix unwrap on None) - #114462 (interpret: add mplace_to_ref helper method) - #114472 (Reword `confusable_idents` lint) - #114477 (Account for `Rc` and `Arc` when suggesting to clone) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/context.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/context.rs b/compiler/rustc_codegen_llvm/src/context.rs index cb093996d1d..3577fb2d951 100644 --- a/compiler/rustc_codegen_llvm/src/context.rs +++ b/compiler/rustc_codegen_llvm/src/context.rs @@ -985,7 +985,7 @@ impl<'tcx> LayoutOfHelpers<'tcx> for CodegenCx<'_, 'tcx> { #[inline] fn handle_layout_err(&self, err: LayoutError<'tcx>, span: Span, ty: Ty<'tcx>) -> ! { - if let LayoutError::SizeOverflow(_) = err { + 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:?}") |