nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-04 02:54:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

update overflow handling for norm, add test

Browse Source
This commit is contained in:
lcnr 2023-11-09 11:14:36 +01:00
parent 28e5c9505c
commit 442e112d17
3 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_trait_selection/src/solve/assembly/mod.rs
View File

@ -352,7 +352,7 @@ impl<'tcx> EvalCtxt<'_, 'tcx> {
let &ty::Alias(_, projection_ty) = goal.predicate.self_ty().kind() else { return };
candidates.extend(self.probe(|_| ProbeKind::NormalizedSelfTyAssembly).enter(|ecx| {
if num_steps < ecx.local_overflow_limit() {
if tcx.recursion_limit().value_within_limit(num_steps) {
let normalized_ty = ecx.next_ty_infer();
let normalizes_to_goal = goal.with(
tcx,

2
compiler/rustc_trait_selection/src/solve/mod.rs
View File

@ -310,7 +310,7 @@ impl<'tcx> EvalCtxt<'_, 'tcx> {
depth: usize,
ty: Ty<'tcx>,
) -> Option<Ty<'tcx>> {
if depth >= self.local_overflow_limit() {
if !self.tcx().recursion_limit().value_within_limit(depth) {
return None;
}

22
tests/ui/traits/new-solver/alias-relate/deeply-nested-no-hang.rs Normal file
View File

@ -0,0 +1,22 @@
// check-pass
// compile-flags: -Ztrait-solver=next
// regression test for trait-system-refactor-initiative#68
trait Identity {
type Assoc: ?Sized;
}
impl<T: ?Sized> Identity for T {
type Assoc = T;
}
type Id<T> = <T as Identity>::Assoc;
type Five<T> = Id<Id<Id<Id<Id<T>>>>>;
type Ty<T> = Five<Five<Five<Five<Five<T>>>>>;
trait Trait<T> {}
impl<T> Trait<T> for Ty<T> {}
impl Trait<u32> for Ty<i32> {}
fn main() {}