Skip to content

Commit

Permalink
Fix an ICE in the recursion lint
Browse files Browse the repository at this point in the history
  • Loading branch information
oli-obk committed Feb 16, 2024
1 parent 0f806a9 commit db4ba49
Show file tree
Hide file tree
Showing 3 changed files with 73 additions and 1 deletion.
4 changes: 3 additions & 1 deletion compiler/rustc_mir_build/src/lints.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
49 changes: 49 additions & 0 deletions tests/ui/traits/normalize-conflicting-impls.rs
Original file line number Diff line number Diff line change
@@ -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() {}
21 changes: 21 additions & 0 deletions tests/ui/traits/normalize-conflicting-impls.stderr
Original file line number Diff line number Diff line change
@@ -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`.

0 comments on commit db4ba49

Please sign in to comment.