Merge remote-tracking branch 'origin/stable-2.0'

Conflicts:
	test-suite/tests/cse.test

1 files changed, 15 insertions, 1 deletions

diff --git a/test-suite/tests/peval.test b/test-suite/tests/peval.test
index b10bedf1f..2bd8919f5 100644
--- a/test-suite/tests/peval.test
+++ b/test-suite/tests/peval.test
@@ -998,4 +998,18 @@
 
   (pass-if-peval
     (car '(1 2))
-    (const 1)))
+    (const 1))
+
+  ;; If we bail out when inlining an identifier because it's too big,
+  ;; but the identifier simply aliases some other identifier, then avoid
+  ;; residualizing a reference to the leaf identifier.  The bailout is
+  ;; driven by the recursive-effort-limit, which is currently 100.  We
+  ;; make sure to trip it with this recursive sum thing.
+  (pass-if-peval resolve-primitives
+    (let ((x (let sum ((n 0) (out 0))
+               (if (< n 10000)
+                   (sum (1+ n) (+ out n))
+                   out))))
+      ((lambda (y) (list y)) x))
+    (let (x) (_) (_)
+         (apply (primitive list) (lexical x _)))))