Use trait definition cycle detection for trait alias definitions, too

This commit is contained in:
Oli Scherer 2024-12-19 08:57:49 +00:00
parent 91b6b4e038
commit 37f2998c6e
5 changed files with 35 additions and 6 deletions

View file

@ -653,7 +653,7 @@ pub(super) fn implied_predicates_with_filter<'tcx>(
} }
} }
} }
PredicateFilter::SelfAndAssociatedTypeBounds => { PredicateFilter::All | PredicateFilter::SelfAndAssociatedTypeBounds => {
for &(pred, span) in implied_bounds { for &(pred, span) in implied_bounds {
debug!("superbound: {:?}", pred); debug!("superbound: {:?}", pred);
if let ty::ClauseKind::Trait(bound) = pred.kind().skip_binder() if let ty::ClauseKind::Trait(bound) = pred.kind().skip_binder()

View file

@ -1,7 +1,7 @@
#![feature(trait_alias)] #![feature(trait_alias)]
trait T1 = T2; trait T1 = T2;
//~^ ERROR cycle detected when computing the super predicates of `T1` //~^ ERROR cycle detected when computing the implied predicates of `T1`
trait T2 = T3; trait T2 = T3;

View file

@ -1,20 +1,20 @@
error[E0391]: cycle detected when computing the super predicates of `T1` error[E0391]: cycle detected when computing the implied predicates of `T1`
--> $DIR/infinite-trait-alias-recursion.rs:3:12 --> $DIR/infinite-trait-alias-recursion.rs:3:12
| |
LL | trait T1 = T2; LL | trait T1 = T2;
| ^^ | ^^
| |
note: ...which requires computing the super predicates of `T2`... note: ...which requires computing the implied predicates of `T2`...
--> $DIR/infinite-trait-alias-recursion.rs:6:12 --> $DIR/infinite-trait-alias-recursion.rs:6:12
| |
LL | trait T2 = T3; LL | trait T2 = T3;
| ^^ | ^^
note: ...which requires computing the super predicates of `T3`... note: ...which requires computing the implied predicates of `T3`...
--> $DIR/infinite-trait-alias-recursion.rs:8:12 --> $DIR/infinite-trait-alias-recursion.rs:8:12
| |
LL | trait T3 = T1 + T3; LL | trait T3 = T1 + T3;
| ^^ | ^^
= note: ...which again requires computing the super predicates of `T1`, completing the cycle = note: ...which again requires computing the implied predicates of `T1`, completing the cycle
= note: trait aliases cannot be recursive = note: trait aliases cannot be recursive
note: cycle used when checking that `T1` is well-formed note: cycle used when checking that `T1` is well-formed
--> $DIR/infinite-trait-alias-recursion.rs:3:1 --> $DIR/infinite-trait-alias-recursion.rs:3:1

View file

@ -0,0 +1,11 @@
//! This test used to get stuck in an infinite
//! recursion during normalization.
//!
//! issue: https://github.com/rust-lang/rust/issues/133901
#![feature(trait_alias)]
fn foo<T: Baz<i32>>() {}
trait Baz<A> = Baz<Option<A>>;
//~^ ERROR: cycle detected when computing the implied predicates of `Baz`
fn main() {}

View file

@ -0,0 +1,18 @@
error[E0391]: cycle detected when computing the implied predicates of `Baz`
--> $DIR/infinite_normalization.rs:8:16
|
LL | trait Baz<A> = Baz<Option<A>>;
| ^^^^^^^^^^^^^^
|
= note: ...which immediately requires computing the implied predicates of `Baz` again
= note: trait aliases cannot be recursive
note: cycle used when computing normalized predicates of `foo`
--> $DIR/infinite_normalization.rs:7:1
|
LL | fn foo<T: Baz<i32>>() {}
| ^^^^^^^^^^^^^^^^^^^^^
= note: see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information
error: aborting due to 1 previous error
For more information about this error, try `rustc --explain E0391`.