Rollup merge of #143793 - fmease:lta-opaq-inf-recur, r=oli-obk

Opaque type collection: Guard against endlessly recursing free alias types

See test description for technical details.

Fixes https://github.com/rust-lang/rust/issues/131994.

r? oli-obk (sry, your queue is large, so no rush & feel free to reassign)
This commit is contained in:
Matthias Krüger 2025-07-17 10:41:45 +02:00 committed by GitHub
commit f78cc42032
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 36 additions and 4 deletions

View file

@ -223,7 +223,10 @@ impl<'tcx> TypeVisitor<TyCtxt<'tcx>> for OpaqueTypeCollector<'tcx> {
}
// Skips type aliases, as they are meant to be transparent.
// FIXME(type_alias_impl_trait): can we require mentioning nested type aliases explicitly?
ty::Alias(ty::Free, alias_ty) if alias_ty.def_id.is_local() => {
ty::Alias(ty::Free, alias_ty) if let Some(def_id) = alias_ty.def_id.as_local() => {
if !self.seen.insert(def_id) {
return;
}
self.tcx
.type_of(alias_ty.def_id)
.instantiate(self.tcx, alias_ty.args)
@ -256,16 +259,16 @@ impl<'tcx> TypeVisitor<TyCtxt<'tcx>> for OpaqueTypeCollector<'tcx> {
return;
}
let impl_args = alias_ty.args.rebase_onto(
let alias_args = alias_ty.args.rebase_onto(
self.tcx,
impl_trait_ref.def_id,
ty::GenericArgs::identity_for_item(self.tcx, parent),
);
if self.tcx.check_args_compatible(assoc.def_id, impl_args) {
if self.tcx.check_args_compatible(assoc.def_id, alias_args) {
self.tcx
.type_of(assoc.def_id)
.instantiate(self.tcx, impl_args)
.instantiate(self.tcx, alias_args)
.visit_with(self);
return;
} else {

View file

@ -0,0 +1,18 @@
// The opaque type collector used to expand free alias types (in situ) without guarding against
// endlessly recursing aliases which lead to the compiler overflowing its stack in certain
// situations.
//
// In most situations we wouldn't even reach the collector when there's an overflow because we
// would've already bailed out early during the item's wfcheck due to the normalization failure.
//
// In the case below however, while collecting the opaque types defined by the AnonConst, we
// descend into its nested items (here: type alias `Recur`) to acquire their opaque types --
// meaning we get there before we wfcheck `Recur`.
//
// issue: <https://github.com/rust-lang/rust/issues/131994>
#![feature(lazy_type_alias)]
#![expect(incomplete_features)]
struct Hold([(); { type Recur = Recur; 0 }]); //~ ERROR overflow normalizing the type alias `Recur`
fn main() {}

View file

@ -0,0 +1,11 @@
error[E0275]: overflow normalizing the type alias `Recur`
--> $DIR/opaq-ty-collection-infinite-recur.rs:16:20
|
LL | struct Hold([(); { type Recur = Recur; 0 }]);
| ^^^^^^^^^^
|
= note: in case this is a recursive type alias, consider using a struct, enum, or union instead
error: aborting due to 1 previous error
For more information about this error, try `rustc --explain E0275`.