Merge ref '6bcdcc73bd11' from rust-lang/rust

Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: 6bcdcc73bd11568fd85f5a38b58e1eda054ad1cd
Filtered ref: 6cc4ce79e1f8dc0ec5a2e18049b9c1a51dee3221

This merge was created using https://github.com/rust-lang/josh-sync.

1 files changed, 20 insertions, 0 deletions

diff --git a/tests/ui/trait-bounds/trait-selection-overflow-prevention-72839.rs b/tests/ui/trait-bounds/trait-selection-overflow-prevention-72839.rs
new file mode 100644
index 00000000000..436657e3de5
--- /dev/null
+++ b/tests/ui/trait-bounds/trait-selection-overflow-prevention-72839.rs
@@ -0,0 +1,20 @@
+// https://github.com/rust-lang/rust/issues/72839
+// Regression test for issue #72839
+// Tests that we do not overflow during trait selection after
+// a type error occurs
+use std::ops::Rem;
+trait Foo {}
+struct MyStruct<T>(T);
+
+impl<T, U> Rem<MyStruct<T>> for MyStruct<U> where MyStruct<U>: Rem<MyStruct<T>> {
+    type Output = u8;
+    fn rem(self, _: MyStruct<T>) -> Self::Output {
+        panic!()
+    }
+}
+
+fn main() {}
+
+fn foo() {
+    if missing_var % 8 == 0 {} //~ ERROR cannot find
+}