simplify test case and add revisions for both solvers

Author: TaKO8Ki

tests/ui/cycle-trait/pointee-sized-next-solver-ice.current.stderr

@@ -0,0 +1,20 @@
+error[E0277]: the trait bound `i32: PointeeSized` is not satisfied
+  --> $DIR/pointee-sized-next-solver-ice.rs:19:21
+   |
+LL |     require_trait::<i32>();
+   |                     ^^^ the trait `PointeeSized` is not implemented for `i32`
+   |
+help: this trait has no implementations, consider adding one
+  --> $DIR/pointee-sized-next-solver-ice.rs:14:1
+   |
+LL | trait PointeeSized {}
+   | ^^^^^^^^^^^^^^^^^^
+note: required by a bound in `require_trait`
+  --> $DIR/pointee-sized-next-solver-ice.rs:16:21
+   |
+LL | fn require_trait<T: PointeeSized>() {}
+   |                     ^^^^^^^^^^^^ required by this bound in `require_trait`
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0277`.

tests/ui/cycle-trait/pointee-sized-next-solver-ice.next.stderr

@@ -0,0 +1,20 @@
+error[E0277]: the trait bound `i32: PointeeSized` is not satisfied
+  --> $DIR/pointee-sized-next-solver-ice.rs:19:21
+   |
+LL |     require_trait::<i32>();
+   |                     ^^^ the trait `PointeeSized` is not implemented for `i32`
+   |
+help: this trait has no implementations, consider adding one
+  --> $DIR/pointee-sized-next-solver-ice.rs:14:1
+   |
+LL | trait PointeeSized {}
+   | ^^^^^^^^^^^^^^^^^^
+note: required by a bound in `require_trait`
+  --> $DIR/pointee-sized-next-solver-ice.rs:16:21
+   |
+LL | fn require_trait<T: PointeeSized>() {}
+   |                     ^^^^^^^^^^^^ required by this bound in `require_trait`
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0277`.

tests/ui/cycle-trait/pointee-sized-next-solver-ice.rs

@@ -1,20 +1,21 @@
-//@ compile-flags: -Znext-solver=globally
+//@ revisions: current next
+//@[next] compile-flags: -Znext-solver
+//@ ignore-compare-mode-next-solver (explicit revisions)
 
 // Regression test for https://github.com/rust-lang/rust/issues/151957
+//
+// When a user-defined trait shares the name `PointeeSized` with
+// `core::marker::PointeeSized`, error reporting tries to check whether
+// the type implements the lang-item `PointeeSized` trait via
+// `predicate_must_hold_modulo_regions`. This creates a `PointeeSized`
+// solver obligation which causes an ICE. We avoid this by skipping the
+// `PointeeSized` lang item during the "similarly named trait" suggestion.
 
-trait PointeeSized {
-    type Undefined;
-}
-
-struct T;
+trait PointeeSized {}
 
-impl PointeeSized for T
-//~^ ERROR not all trait items implemented, missing: `Undefined`
-//~| ERROR the trait bound `T: PointeeSized` is not satisfied
-where
-    <T as PointeeSized>::Undefined: PointeeSized,
-//~^ ERROR the trait bound `T: PointeeSized` is not satisfied
-//~| ERROR the trait bound `T: PointeeSized` is not satisfied
-{}
+fn require_trait<T: PointeeSized>() {}
 
-fn main() {}
+fn main() {
+    require_trait::<i32>();
+    //~^ ERROR the trait bound `i32: PointeeSized` is not satisfied
+}