mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

impl SessionDiagnostic for LayoutError and Spanned<T>

Browse Source
This commit is contained in:
Ellis Hoag 2022-09-11 17:34:51 -07:00
parent 059326c4bd
commit 5c839d995b
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/context.rs
View File

@ -13,7 +13,7 @@
use rustc_middle::ty::{self, Instance, ParamEnv, PolyExistentialTraitRef, Ty, TyCtxt};
use rustc_middle::ty::layout::{FnAbiError, FnAbiOfHelpers, FnAbiRequest, HasParamEnv, HasTyCtxt, LayoutError, TyAndLayout, LayoutOfHelpers};
use rustc_session::Session;
use rustc_span::Span;
use rustc_span::{Span, source_map::respan};
use rustc_target::abi::{call::FnAbi, HasDataLayout, PointeeInfo, Size, TargetDataLayout, VariantIdx};
use rustc_target::spec::{HasTargetSpec, Target, TlsModel};
@ -478,6 +478,23 @@ impl<'gcc, 'tcx> LayoutOfHelpers<'tcx> for CodegenCx<'gcc, 'tcx> {
#[inline]
fn handle_layout_err(&self, err: LayoutError<'tcx>, span: Span, ty: Ty<'tcx>) -> ! {
if let LayoutError::SizeOverflow(_) = err {
let _ = respan(span, err);
// error: lifetime may not live long enough
// --> src/context.rs:483:13
// |
// 475 | impl<'gcc, 'tcx> LayoutOfHelpers<'tcx> for CodegenCx<'gcc, 'tcx> {
// | ---- ---- lifetime `'tcx` defined here
// | |
// | lifetime `'gcc` defined here
// ...
// 483 | self.sess().emit_fatal(respan(span, err))
// | ^^^^^^^^^^^ argument requires that `'gcc` must outlive `'tcx`
// |
// = help: consider adding the following bound: `'gcc: 'tcx`
// = note: requirement occurs because of the type `CodegenCx<'_, '_>`, which makes the generic argument `'_` invariant
// = note: the struct `CodegenCx<'gcc, 'tcx>` is invariant over the parameter `'gcc`
// = help: see <https://doc.rust-lang.org/nomicon/subtyping.html> for more information about variance
// self.sess().emit_fatal(respan(span, err))
self.sess().emit_fatal(LayoutSizeOverflow { span, error: err.to_string() })
} else {
span_bug!(span, "failed to get layout for `{}`: {}", ty, err)