rust-lang
diff --git a/‎compiler/rustc_hir_typeck/src/fn_ctxt/mod.rs
Copy file name to clipboardExpand all lines: compiler/rustc_hir_typeck/src/fn_ctxt/mod.rs
+5-1Lines changed: 5 additions & 1 deletion b/‎compiler/rustc_hir_typeck/src/fn_ctxt/mod.rs
Copy file name to clipboardExpand all lines: compiler/rustc_hir_typeck/src/fn_ctxt/mod.rs
+5-1Lines changed: 5 additions & 1 deletion
diff --git a/‎tests/crashes/132320.rs
Copy file name to clipboardExpand all lines: tests/crashes/132320.rs
-15Lines changed: 0 additions & 15 deletions b/‎tests/crashes/132320.rs
Copy file name to clipboardExpand all lines: tests/crashes/132320.rs
-15Lines changed: 0 additions & 15 deletions
diff --git a/‎tests/ui/traits/next-solver/typeck/structurally-resolve-in-probe_adt.rs
Copy file name to clipboard
+15Lines changed: 15 additions & 0 deletions b/‎tests/ui/traits/next-solver/typeck/structurally-resolve-in-probe_adt.rs
Copy file name to clipboard
+15Lines changed: 15 additions & 0 deletions
@@ -307,7 +307,11 @@ impl<'tcx> HirTyLowerer<'tcx> for FnCtxt<'_, 'tcx> {
             ty::Alias(ty::Projection | ty::Inherent | ty::Weak, _)
                 if !ty.has_escaping_bound_vars() =>
             {
-                self.normalize(span, ty).ty_adt_def()
+                if self.next_trait_solver() {
+                    self.try_structurally_resolve_type(span, ty).ty_adt_def()
+                } else {
+                    self.normalize(span, ty).ty_adt_def()
+                }
             }
             _ => None,
         }
 
@@ -0,0 +1,15 @@
+//@ check-pass
+//@ compile-flags: -Znext-solver
+
+trait Mirror {
+    type Assoc;
+}
+impl<T> Mirror for T {
+    type Assoc = T;
+}
+
+type Foo<T> = <Option<T> as Mirror>::Assoc;
+
+fn main() {
+    let x = Foo::<i32>::None;
+}
Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,11 @@ impl<'tcx> HirTyLowerer<'tcx> for FnCtxt<'_, 'tcx> {`
`307`	`307`	`ty::Alias(ty::Projection \| ty::Inherent \| ty::Weak, _)`
`308`	`308`	`if !ty.has_escaping_bound_vars() =>`
`309`	`309`	`{`
`310`		`- self.normalize(span, ty).ty_adt_def()`
	`310`	`+ if self.next_trait_solver() {`
	`311`	`+ self.try_structurally_resolve_type(span, ty).ty_adt_def()`
	`312`	`+ } else {`
	`313`	`+ self.normalize(span, ty).ty_adt_def()`
	`314`	`+ }`
`311`	`315`	`}`
`312`	`316`	`_ => None,`
`313`	`317`	`}`