Merge from rust-lang/rust

1 files changed, 10 insertions, 0 deletions

diff --git a/tests/ui/runtime/deep_recursion.rs b/tests/ui/runtime/deep_recursion.rs
new file mode 100644
index 00000000000..bf220f174a1
--- /dev/null
+++ b/tests/ui/runtime/deep_recursion.rs
@@ -0,0 +1,10 @@
+//! Checks deep recursion behavior.
+
+//@ run-pass
+//@ ignore-emscripten apparently blows the stack
+
+fn f(x: isize) -> isize {
+    if x == 1 { return 1; } else { let y: isize = 1 + f(x - 1); return y; }
+}
+
+pub fn main() { assert_eq!(f(5000), 5000); }