Auto merge of #60721 - estebank:ice-ice-baby, r=varkor

bors · bors · commit 7519eaca9a25 · 2019-05-11T03:56:11.000Z
Avoid ICE by using delay_span_bug Fix #59406, fix #53498.
diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs
@@ -5474,10 +5474,11 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
             match self.at(&self.misc(span), self.param_env).sup(impl_ty, self_ty) {
                 Ok(ok) => self.register_infer_ok_obligations(ok),
                 Err(_) => {
-                    span_bug!(span,
+                    self.tcx.sess.delay_span_bug(span, &format!(
                         "instantiate_value_path: (UFCS) {:?} was a subtype of {:?} but now is not?",
                         self_ty,
-                        impl_ty);
+                        impl_ty,
+                    ));
                 }
             }
         }
diff --git a/src/test/ui/issues/issue-53498.rs b/src/test/ui/issues/issue-53498.rs
@@ -0,0 +1,17 @@
+pub mod test {
+    pub struct A;
+    pub struct B;
+    pub struct Foo<T>(T);
+
+    impl Foo<A> {
+        fn foo() {}
+    }
+
+    impl Foo<B> {
+        fn foo() {}
+    }
+}
+
+fn main() {
+    test::Foo::<test::B>::foo(); //~ ERROR method `foo` is private
+}
diff --git a/src/test/ui/issues/issue-53498.stderr b/src/test/ui/issues/issue-53498.stderr
@@ -0,0 +1,9 @@
+error[E0624]: method `foo` is private
+  --> $DIR/issue-53498.rs:16:5
+   |
+LL |     test::Foo::<test::B>::foo();
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0624`.

Original file line number	Diff line number	Diff line change
`@@ -5474,10 +5474,11 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {`
`5474`	`5474`	`match self.at(&self.misc(span), self.param_env).sup(impl_ty, self_ty) {`
`5475`	`5475`	`Ok(ok) => self.register_infer_ok_obligations(ok),`
`5476`	`5476`	`Err(_) => {`
`5477`		`- span_bug!(span,`
	`5477`	`+ self.tcx.sess.delay_span_bug(span, &format!(`
`5478`	`5478`	`"instantiate_value_path: (UFCS) {:?} was a subtype of {:?} but now is not?",`
`5479`	`5479`	`self_ty,`
`5480`		`- impl_ty);`
	`5480`	`+ impl_ty,`
	`5481`	`+ ));`
`5481`	`5482`	`}`
`5482`	`5483`	`}`
`5483`	`5484`	`}`