Unrolled build for rust-lang#121181

Rollup merge of rust-lang#121181 - oli-obk:normalize_with_conflicting_impls, r=cjgillot

Fix an ICE in the recursion lint

fixes rust-lang#121170

I looked into it, and there is no good path towards tainting mir_build (where the ICE happens), but using `try_normalize` in a lint seems generally better anyway

compiler/rustc_mir_build/src/lints.rs

@@ -137,7 +137,9 @@ impl<'tcx> TerminatorClassifier<'tcx> for CallRecursion<'tcx> {
 
         let func_ty = func.ty(body, tcx);
         if let ty::FnDef(callee, args) = *func_ty.kind() {
-            let normalized_args = tcx.normalize_erasing_regions(param_env, args);
+            let Ok(normalized_args) = tcx.try_normalize_erasing_regions(param_env, args) else {
+                return false;
+            };
             let (callee, call_args) = if let Ok(Some(instance)) =
                 Instance::resolve(tcx, param_env, callee, normalized_args)
             {

tests/ui/traits/normalize-conflicting-impls.rs

@@ -0,0 +1,49 @@
+fn problematic_function<Space>(material_surface_element: ())
+where
+    DefaultAllocator: FiniteElementAllocator<(), Space>,
+{
+    let _: Point2<f64> = material_surface_element.map_reference_coords().into();
+}
+
+impl<N, R> Allocator<N, R> for DefaultAllocator
+where
+    R::Value: DimName, //~ ERROR: `Value` not found for `R`
+{
+    type Buffer = ();
+}
+impl<N> Allocator<N, ()> for DefaultAllocator {}
+//~^ ERROR: conflicting implementations
+impl DimName for () {}
+impl DimName for u32 {}
+impl<N, D: DimName> From<VectorN<N, D>> for Point<N, D> {
+    fn from(_: VectorN<N, D>) -> Self {
+        todo!()
+    }
+}
+
+impl FiniteElement<u32> for () {}
+
+type VectorN<N, D> = Matrix<<DefaultAllocator as Allocator<N, D>>::Buffer>;
+
+type Point2<N> = Point<N, u32>;
+
+struct DefaultAllocator;
+struct Matrix<S>(S);
+struct Point<N, D>(N, D);
+
+trait Allocator<Scalar, R> {
+    type Buffer;
+}
+trait DimName {}
+trait FiniteElementAllocator<GeometryDim, NodalDim>:
+    Allocator<f64, ()> + Allocator<f64, NodalDim>
+{
+}
+
+trait FiniteElement<GeometryDim> {
+    fn map_reference_coords(&self) -> VectorN<f64, GeometryDim> {
+        todo!()
+    }
+}
+
+fn main() {}

tests/ui/traits/normalize-conflicting-impls.stderr

@@ -0,0 +1,21 @@
+error[E0220]: associated type `Value` not found for `R`
+  --> $DIR/normalize-conflicting-impls.rs:10:8
+   |
+LL |     R::Value: DimName,
+   |        ^^^^^ associated type `Value` not found
+
+error[E0119]: conflicting implementations of trait `Allocator<_, ()>` for type `DefaultAllocator`
+  --> $DIR/normalize-conflicting-impls.rs:14:1
+   |
+LL | / impl<N, R> Allocator<N, R> for DefaultAllocator
+LL | | where
+LL | |     R::Value: DimName,
+   | |______________________- first implementation here
+...
+LL |   impl<N> Allocator<N, ()> for DefaultAllocator {}
+   |   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `DefaultAllocator`
+
+error: aborting due to 2 previous errors
+
+Some errors have detailed explanations: E0119, E0220.
+For more information about an error, try `rustc --explain E0119`.