Merge ref 'a1dbb443527b' from rust-lang/rust

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

Upstream ref: a1dbb443527bd126452875eb5d5860c1d001d761
Filtered ref: c2339048a82c55166f9b9ee83fd618be252a6e23

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

1 files changed, 16 insertions, 0 deletions

diff --git a/tests/ui/recursion/infinite-function-recursion-error-8727.rs b/tests/ui/recursion/infinite-function-recursion-error-8727.rs
new file mode 100644
index 00000000000..a4037f76109
--- /dev/null
+++ b/tests/ui/recursion/infinite-function-recursion-error-8727.rs
@@ -0,0 +1,16 @@
+// https://github.com/rust-lang/rust/issues/8727
+// Verify the compiler fails with an error on infinite function
+// recursions.
+
+//@ build-fail
+//@ compile-flags: --diagnostic-width=100 -Zwrite-long-types-to-disk=yes
+
+fn generic<T>() { //~ WARN function cannot return without recursing
+    generic::<Option<T>>();
+}
+//~^^ ERROR reached the recursion limit while instantiating `generic::<Option<
+
+fn main () {
+    // Use generic<T> at least once to trigger instantiation.
+    generic::<i32>();
+}