Skip to content

Commit ba76096

Browse files
borsbors
committed
Auto merge of rust-lang#111035 - Nilstrieb:layout-err, r=wesleywiser
Shrink error variants for layout and fn_abi The errors are bigger than the result, so let's put them behind a reference. Since query results have to be `Copy`, we use a reference into the arena instead of a `Box<T>`.
2 parents 6162f6f + 4be8477 commit ba76096

File tree

13 files changed

+108
-80
lines changed

13 files changed

+108
-80
lines changed

‎compiler/rustc_const_eval/src/interpret/intrinsics.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ pub(crate) fn eval_nullary_intrinsic<'tcx>(
7272
}
7373
sym::pref_align_of => {
7474
// Correctly handles non-monomorphic calls, so there is no need for ensure_monomorphic_enough.
75-
let layout = tcx.layout_of(param_env.and(tp_ty)).map_err(|e| err_inval!(Layout(e)))?;
75+
let layout = tcx.layout_of(param_env.and(tp_ty)).map_err(|e| err_inval!(Layout(*e)))?;
7676
ConstValue::from_target_usize(layout.align.pref.bytes(), &tcx)
7777
}
7878
sym::type_id => {

‎compiler/rustc_const_eval/src/util/check_validity_requirement.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ pub fn check_validity_requirement<'tcx>(
2121
tcx: TyCtxt<'tcx>,
2222
kind: ValidityRequirement,
2323
param_env_and_ty: ParamEnvAnd<'tcx, Ty<'tcx>>,
24-
) -> Result<bool, LayoutError<'tcx>> {
24+
) -> Result<bool, &'tcx LayoutError<'tcx>> {
2525
let layout = tcx.layout_of(param_env_and_ty)?;
2626

2727
// There is nothing strict or lax about inhabitedness.
@@ -43,7 +43,7 @@ fn might_permit_raw_init_strict<'tcx>(
4343
ty: TyAndLayout<'tcx>,
4444
tcx: TyCtxt<'tcx>,
4545
kind: ValidityRequirement,
46-
) -> Result<bool, LayoutError<'tcx>> {
46+
) -> Result<bool, &'tcx LayoutError<'tcx>> {
4747
let machine = CompileTimeInterpreter::new(CanAccessStatics::No, CheckAlignment::Error);
4848

4949
let mut cx = InterpCx::new(tcx, rustc_span::DUMMY_SP, ParamEnv::reveal_all(), machine);
@@ -75,7 +75,7 @@ fn might_permit_raw_init_lax<'tcx>(
7575
this: TyAndLayout<'tcx>,
7676
cx: &LayoutCx<'tcx, TyCtxt<'tcx>>,
7777
init_kind: ValidityRequirement,
78-
) -> Result<bool, LayoutError<'tcx>> {
78+
) -> Result<bool, &'tcx LayoutError<'tcx>> {
7979
let scalar_allows_raw_init = move |s: Scalar| -> bool {
8080
match init_kind {
8181
ValidityRequirement::Inhabited => {

‎compiler/rustc_hir_typeck/src/intrinsicck.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
8181
}
8282

8383
// Try to display a sensible error with as much information as possible.
84-
let skeleton_string = |ty: Ty<'tcx>, sk| match sk {
84+
let skeleton_string = |ty: Ty<'tcx>, sk: Result<_, &_>| match sk {
8585
Ok(SizeSkeleton::Pointer { tail, .. }) => format!("pointer to `{tail}`"),
8686
Ok(SizeSkeleton::Known(size)) => {
8787
if let Some(v) = u128::from(size.bytes()).checked_mul(8) {
@@ -101,7 +101,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
101101
}
102102
}
103103
Err(LayoutError::Unknown(bad)) => {
104-
if bad == ty {
104+
if *bad == ty {
105105
"this type does not have a fixed size".to_owned()
106106
} else {
107107
format!("size can vary because of {bad}")

‎compiler/rustc_middle/src/query/erase.rs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ impl<T> EraseType for Result<&'_ T, traits::CodegenObligationError> {
7171
type Result = [u8; size_of::<Result<&'static (), traits::CodegenObligationError>>()];
7272
}
7373

74-
impl<T> EraseType for Result<&'_ T, ty::layout::FnAbiError<'_>> {
75-
type Result = [u8; size_of::<Result<&'static (), ty::layout::FnAbiError<'static>>>()];
74+
impl<T> EraseType for Result<&'_ T, &'_ ty::layout::FnAbiError<'_>> {
75+
type Result = [u8; size_of::<Result<&'static (), &'static ty::layout::FnAbiError<'static>>>()];
7676
}
7777

7878
impl<T> EraseType for Result<(&'_ T, rustc_middle::thir::ExprId), rustc_errors::ErrorGuaranteed> {
@@ -96,15 +96,17 @@ impl EraseType for Result<ty::GenericArg<'_>, traits::query::NoSolution> {
9696
type Result = [u8; size_of::<Result<ty::GenericArg<'static>, traits::query::NoSolution>>()];
9797
}
9898

99-
impl EraseType for Result<bool, ty::layout::LayoutError<'_>> {
100-
type Result = [u8; size_of::<Result<bool, ty::layout::LayoutError<'static>>>()];
99+
impl EraseType for Result<bool, &ty::layout::LayoutError<'_>> {
100+
type Result = [u8; size_of::<Result<bool, &'static ty::layout::LayoutError<'static>>>()];
101101
}
102102

103-
impl EraseType for Result<rustc_target::abi::TyAndLayout<'_, Ty<'_>>, ty::layout::LayoutError<'_>> {
103+
impl EraseType
104+
for Result<rustc_target::abi::TyAndLayout<'_, Ty<'_>>, &ty::layout::LayoutError<'_>>
105+
{
104106
type Result = [u8; size_of::<
105107
Result<
106108
rustc_target::abi::TyAndLayout<'static, Ty<'static>>,
107-
ty::layout::LayoutError<'static>,
109+
&'static ty::layout::LayoutError<'static>,
108110
>,
109111
>()];
110112
}

‎compiler/rustc_middle/src/query/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1383,7 +1383,7 @@ rustc_queries! {
13831383
/// executes in "reveal all" mode, and will normalize the input type.
13841384
query layout_of(
13851385
key: ty::ParamEnvAnd<'tcx, Ty<'tcx>>
1386-
) -> Result<ty::layout::TyAndLayout<'tcx>, ty::layout::LayoutError<'tcx>> {
1386+
) -> Result<ty::layout::TyAndLayout<'tcx>, &'tcx ty::layout::LayoutError<'tcx>> {
13871387
depth_limit
13881388
desc { "computing layout of `{}`", key.value }
13891389
}
@@ -1394,7 +1394,7 @@ rustc_queries! {
13941394
/// instead, where the instance is an `InstanceDef::Virtual`.
13951395
query fn_abi_of_fn_ptr(
13961396
key: ty::ParamEnvAnd<'tcx, (ty::PolyFnSig<'tcx>, &'tcx ty::List<Ty<'tcx>>)>
1397-
) -> Result<&'tcx abi::call::FnAbi<'tcx, Ty<'tcx>>, ty::layout::FnAbiError<'tcx>> {
1397+
) -> Result<&'tcx abi::call::FnAbi<'tcx, Ty<'tcx>>, &'tcx ty::layout::FnAbiError<'tcx>> {
13981398
desc { "computing call ABI of `{}` function pointers", key.value.0 }
13991399
}
14001400

@@ -1405,7 +1405,7 @@ rustc_queries! {
14051405
/// to an `InstanceDef::Virtual` instance (of `<dyn Trait as Trait>::fn`).
14061406
query fn_abi_of_instance(
14071407
key: ty::ParamEnvAnd<'tcx, (ty::Instance<'tcx>, &'tcx ty::List<Ty<'tcx>>)>
1408-
) -> Result<&'tcx abi::call::FnAbi<'tcx, Ty<'tcx>>, ty::layout::FnAbiError<'tcx>> {
1408+
) -> Result<&'tcx abi::call::FnAbi<'tcx, Ty<'tcx>>, &'tcx ty::layout::FnAbiError<'tcx>> {
14091409
desc { "computing call ABI of `{}`", key.value.0 }
14101410
}
14111411

@@ -2164,7 +2164,7 @@ rustc_queries! {
21642164
separate_provide_extern
21652165
}
21662166

2167-
query check_validity_requirement(key: (ValidityRequirement, ty::ParamEnvAnd<'tcx, Ty<'tcx>>)) -> Result<bool, ty::layout::LayoutError<'tcx>> {
2167+
query check_validity_requirement(key: (ValidityRequirement, ty::ParamEnvAnd<'tcx, Ty<'tcx>>)) -> Result<bool, &'tcx ty::layout::LayoutError<'tcx>> {
21682168
desc { "checking validity requirement for `{}`: {}", key.1.value, key.0 }
21692169
}
21702170

‎compiler/rustc_middle/src/ty/layout.rs

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ impl<'tcx> SizeSkeleton<'tcx> {
310310
ty: Ty<'tcx>,
311311
tcx: TyCtxt<'tcx>,
312312
param_env: ty::ParamEnv<'tcx>,
313-
) -> Result<SizeSkeleton<'tcx>, LayoutError<'tcx>> {
313+
) -> Result<SizeSkeleton<'tcx>, &'tcx LayoutError<'tcx>> {
314314
debug_assert!(!ty.has_non_region_infer());
315315

316316
// First try computing a static layout.
@@ -353,21 +353,21 @@ impl<'tcx> SizeSkeleton<'tcx> {
353353
let size = s
354354
.bytes()
355355
.checked_mul(c)
356-
.ok_or_else(|| LayoutError::SizeOverflow(ty))?;
356+
.ok_or_else(|| &*tcx.arena.alloc(LayoutError::SizeOverflow(ty)))?;
357357
return Ok(SizeSkeleton::Known(Size::from_bytes(size)));
358358
}
359359
let len = tcx.expand_abstract_consts(len);
360360
let prev = ty::Const::from_target_usize(tcx, s.bytes());
361361
let Some(gen_size) = mul_sorted_consts(tcx, param_env, len, prev) else {
362-
return Err(LayoutError::SizeOverflow(ty));
362+
return Err(tcx.arena.alloc(LayoutError::SizeOverflow(ty)));
363363
};
364364
Ok(SizeSkeleton::Generic(gen_size))
365365
}
366366
SizeSkeleton::Pointer { .. } => Err(err),
367367
SizeSkeleton::Generic(g) => {
368368
let len = tcx.expand_abstract_consts(len);
369369
let Some(gen_size) = mul_sorted_consts(tcx, param_env, len, g) else {
370-
return Err(LayoutError::SizeOverflow(ty));
370+
return Err(tcx.arena.alloc(LayoutError::SizeOverflow(ty)));
371371
};
372372
Ok(SizeSkeleton::Generic(gen_size))
373373
}
@@ -672,33 +672,43 @@ pub trait LayoutOf<'tcx>: LayoutOfHelpers<'tcx> {
672672

673673
MaybeResult::from(
674674
tcx.layout_of(self.param_env().and(ty))
675-
.map_err(|err| self.handle_layout_err(err, span, ty)),
675+
.map_err(|err| self.handle_layout_err(*err, span, ty)),
676676
)
677677
}
678678
}
679679

680680
impl<'tcx, C: LayoutOfHelpers<'tcx>> LayoutOf<'tcx> for C {}
681681

682682
impl<'tcx> LayoutOfHelpers<'tcx> for LayoutCx<'tcx, TyCtxt<'tcx>> {
683-
type LayoutOfResult = Result<TyAndLayout<'tcx>, LayoutError<'tcx>>;
683+
type LayoutOfResult = Result<TyAndLayout<'tcx>, &'tcx LayoutError<'tcx>>;
684684

685685
#[inline]
686-
fn handle_layout_err(&self, err: LayoutError<'tcx>, _: Span, _: Ty<'tcx>) -> LayoutError<'tcx> {
687-
err
686+
fn handle_layout_err(
687+
&self,
688+
err: LayoutError<'tcx>,
689+
_: Span,
690+
_: Ty<'tcx>,
691+
) -> &'tcx LayoutError<'tcx> {
692+
self.tcx.arena.alloc(err)
688693
}
689694
}
690695

691696
impl<'tcx> LayoutOfHelpers<'tcx> for LayoutCx<'tcx, TyCtxtAt<'tcx>> {
692-
type LayoutOfResult = Result<TyAndLayout<'tcx>, LayoutError<'tcx>>;
697+
type LayoutOfResult = Result<TyAndLayout<'tcx>, &'tcx LayoutError<'tcx>>;
693698

694699
#[inline]
695700
fn layout_tcx_at_span(&self) -> Span {
696701
self.tcx.span
697702
}
698703

699704
#[inline]
700-
fn handle_layout_err(&self, err: LayoutError<'tcx>, _: Span, _: Ty<'tcx>) -> LayoutError<'tcx> {
701-
err
705+
fn handle_layout_err(
706+
&self,
707+
err: LayoutError<'tcx>,
708+
_: Span,
709+
_: Ty<'tcx>,
710+
) -> &'tcx LayoutError<'tcx> {
711+
self.tcx.arena.alloc(err)
702712
}
703713
}
704714

@@ -1250,18 +1260,6 @@ pub enum FnAbiError<'tcx> {
12501260
AdjustForForeignAbi(call::AdjustForForeignAbiError),
12511261
}
12521262

1253-
impl<'tcx> From<LayoutError<'tcx>> for FnAbiError<'tcx> {
1254-
fn from(err: LayoutError<'tcx>) -> Self {
1255-
Self::Layout(err)
1256-
}
1257-
}
1258-
1259-
impl From<call::AdjustForForeignAbiError> for FnAbiError<'_> {
1260-
fn from(err: call::AdjustForForeignAbiError) -> Self {
1261-
Self::AdjustForForeignAbi(err)
1262-
}
1263-
}
1264-
12651263
impl<'a, 'b> IntoDiagnostic<'a, !> for FnAbiError<'b> {
12661264
fn into_diagnostic(self, handler: &'a Handler) -> DiagnosticBuilder<'a, !> {
12671265
match self {
@@ -1321,7 +1319,7 @@ pub trait FnAbiOf<'tcx>: FnAbiOfHelpers<'tcx> {
13211319
let tcx = self.tcx().at(span);
13221320

13231321
MaybeResult::from(tcx.fn_abi_of_fn_ptr(self.param_env().and((sig, extra_args))).map_err(
1324-
|err| self.handle_fn_abi_err(err, span, FnAbiRequest::OfFnPtr { sig, extra_args }),
1322+
|err| self.handle_fn_abi_err(*err, span, FnAbiRequest::OfFnPtr { sig, extra_args }),
13251323
))
13261324
}
13271325

@@ -1348,7 +1346,11 @@ pub trait FnAbiOf<'tcx>: FnAbiOfHelpers<'tcx> {
13481346
// However, we don't do this early in order to avoid calling
13491347
// `def_span` unconditionally (which may have a perf penalty).
13501348
let span = if !span.is_dummy() { span } else { tcx.def_span(instance.def_id()) };
1351-
self.handle_fn_abi_err(err, span, FnAbiRequest::OfInstance { instance, extra_args })
1349+
self.handle_fn_abi_err(
1350+
*err,
1351+
span,
1352+
FnAbiRequest::OfInstance { instance, extra_args },
1353+
)
13521354
}),
13531355
)
13541356
}

‎compiler/rustc_middle/src/values.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,12 @@ impl<'tcx> Value<TyCtxt<'tcx>, DepKind> for ty::EarlyBinder<ty::Binder<'_, ty::F
106106
}
107107
}
108108

109-
impl<'tcx, T> Value<TyCtxt<'tcx>, DepKind> for Result<T, ty::layout::LayoutError<'_>> {
109+
impl<'tcx, T> Value<TyCtxt<'tcx>, DepKind> for Result<T, &'_ ty::layout::LayoutError<'_>> {
110110
fn from_cycle_error(_tcx: TyCtxt<'tcx>, _cycle: &[QueryInfo<DepKind>]) -> Self {
111-
Err(ty::layout::LayoutError::Cycle)
111+
// tcx.arena.alloc cannot be used because we are not allowed to use &'tcx LayoutError under
112+
// min_specialization. Since this is an error path anyways, leaking doesn't matter (and really,
113+
// tcx.arena.alloc is pretty much equal to leaking).
114+
Err(Box::leak(Box::new(ty::layout::LayoutError::Cycle)))
112115
}
113116
}
114117

‎compiler/rustc_passes/src/layout_test.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ fn dump_layout_of(tcx: TyCtxt<'_>, item_def_id: LocalDefId, attr: &Attribute) {
9494
Err(layout_error) => {
9595
tcx.sess.emit_fatal(Spanned {
9696
node: layout_error.into_diagnostic(),
97+
9798
span: tcx.def_span(item_def_id.to_def_id()),
9899
});
99100
}

‎compiler/rustc_transmute/src/layout/tree.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,8 @@ pub(crate) mod rustc {
192192
TypeError(ErrorGuaranteed),
193193
}
194194

195-
impl<'tcx> From<LayoutError<'tcx>> for Err {
196-
fn from(err: LayoutError<'tcx>) -> Self {
195+
impl<'tcx> From<&LayoutError<'tcx>> for Err {
196+
fn from(err: &LayoutError<'tcx>) -> Self {
197197
match err {
198198
LayoutError::Unknown(..) => Self::UnknownLayout,
199199
err => unimplemented!("{:?}", err),
@@ -221,7 +221,7 @@ pub(crate) mod rustc {
221221
}
222222

223223
impl LayoutSummary {
224-
fn from_ty<'tcx>(ty: Ty<'tcx>, ctx: TyCtxt<'tcx>) -> Result<Self, LayoutError<'tcx>> {
224+
fn from_ty<'tcx>(ty: Ty<'tcx>, ctx: TyCtxt<'tcx>) -> Result<Self, &'tcx LayoutError<'tcx>> {
225225
use rustc_middle::ty::ParamEnvAnd;
226226
use rustc_target::abi::{TyAndLayout, Variants};
227227

@@ -482,7 +482,7 @@ pub(crate) mod rustc {
482482
fn layout_of<'tcx>(
483483
ctx: TyCtxt<'tcx>,
484484
ty: Ty<'tcx>,
485-
) -> Result<alloc::Layout, LayoutError<'tcx>> {
485+
) -> Result<alloc::Layout, &'tcx LayoutError<'tcx>> {
486486
use rustc_middle::ty::ParamEnvAnd;
487487
use rustc_target::abi::TyAndLayout;
488488

‎compiler/rustc_ty_utils/src/abi.rs

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ fn conv_from_spec_abi(tcx: TyCtxt<'_>, abi: SpecAbi) -> Conv {
202202
fn fn_abi_of_fn_ptr<'tcx>(
203203
tcx: TyCtxt<'tcx>,
204204
query: ty::ParamEnvAnd<'tcx, (ty::PolyFnSig<'tcx>, &'tcx ty::List<Ty<'tcx>>)>,
205-
) -> Result<&'tcx FnAbi<'tcx, Ty<'tcx>>, FnAbiError<'tcx>> {
205+
) -> Result<&'tcx FnAbi<'tcx, Ty<'tcx>>, &'tcx FnAbiError<'tcx>> {
206206
let (param_env, (sig, extra_args)) = query.into_parts();
207207

208208
let cx = LayoutCx { tcx, param_env };
@@ -212,7 +212,7 @@ fn fn_abi_of_fn_ptr<'tcx>(
212212
fn fn_abi_of_instance<'tcx>(
213213
tcx: TyCtxt<'tcx>,
214214
query: ty::ParamEnvAnd<'tcx, (ty::Instance<'tcx>, &'tcx ty::List<Ty<'tcx>>)>,
215-
) -> Result<&'tcx FnAbi<'tcx, Ty<'tcx>>, FnAbiError<'tcx>> {
215+
) -> Result<&'tcx FnAbi<'tcx, Ty<'tcx>>, &'tcx FnAbiError<'tcx>> {
216216
let (param_env, (instance, extra_args)) = query.into_parts();
217217

218218
let sig = fn_sig_for_fn_abi(tcx, instance, param_env);
@@ -331,7 +331,7 @@ fn fn_abi_new_uncached<'tcx>(
331331
fn_def_id: Option<DefId>,
332332
// FIXME(eddyb) replace this with something typed, like an `enum`.
333333
force_thin_self_ptr: bool,
334-
) -> Result<&'tcx FnAbi<'tcx, Ty<'tcx>>, FnAbiError<'tcx>> {
334+
) -> Result<&'tcx FnAbi<'tcx, Ty<'tcx>>, &'tcx FnAbiError<'tcx>> {
335335
let sig = cx.tcx.normalize_erasing_late_bound_regions(cx.param_env, sig);
336336

337337
let conv = conv_from_spec_abi(cx.tcx(), sig.abi);
@@ -376,7 +376,7 @@ fn fn_abi_new_uncached<'tcx>(
376376
let is_drop_in_place =
377377
fn_def_id.is_some() && fn_def_id == cx.tcx.lang_items().drop_in_place_fn();
378378

379-
let arg_of = |ty: Ty<'tcx>, arg_idx: Option<usize>| -> Result<_, FnAbiError<'tcx>> {
379+
let arg_of = |ty: Ty<'tcx>, arg_idx: Option<usize>| -> Result<_, &'tcx FnAbiError<'tcx>> {
380380
let span = tracing::debug_span!("arg_of");
381381
let _entered = span.enter();
382382
let is_return = arg_idx.is_none();
@@ -386,7 +386,8 @@ fn fn_abi_new_uncached<'tcx>(
386386
_ => bug!("argument to drop_in_place is not a raw ptr: {:?}", ty),
387387
});
388388

389-
let layout = cx.layout_of(ty)?;
389+
let layout =
390+
cx.layout_of(ty).map_err(|err| &*cx.tcx.arena.alloc(FnAbiError::Layout(*err)))?;
390391
let layout = if force_thin_self_ptr && arg_idx == Some(0) {
391392
// Don't pass the vtable, it's not an argument of the virtual fn.
392393
// Instead, pass just the data pointer, but give it the type `*const/mut dyn Trait`
@@ -454,7 +455,7 @@ fn fn_abi_adjust_for_abi<'tcx>(
454455
fn_abi: &mut FnAbi<'tcx, Ty<'tcx>>,
455456
abi: SpecAbi,
456457
fn_def_id: Option<DefId>,
457-
) -> Result<(), FnAbiError<'tcx>> {
458+
) -> Result<(), &'tcx FnAbiError<'tcx>> {
458459
if abi == SpecAbi::Unadjusted {
459460
return Ok(());
460461
}
@@ -548,7 +549,9 @@ fn fn_abi_adjust_for_abi<'tcx>(
548549
fixup(arg, Some(arg_idx));
549550
}
550551
} else {
551-
fn_abi.adjust_for_foreign_abi(cx, abi)?;
552+
fn_abi
553+
.adjust_for_foreign_abi(cx, abi)
554+
.map_err(|err| &*cx.tcx.arena.alloc(FnAbiError::AdjustForForeignAbi(err)))?;
552555
}
553556

554557
Ok(())

0 commit comments

Comments
 (0)