Add some recursion-checking tests

Author: kmod

src/codegen/ast_interpreter.cpp

@@ -452,7 +452,15 @@ Box* ASTInterpreter::executeInner(ASTInterpreter& interpreter, CFGBlock* start_b
 
 Box* ASTInterpreter::execute(ASTInterpreter& interpreter, CFGBlock* start_block, BST_stmt* start_at) {
     UNAVOIDABLE_STAT_TIMER(t0, "us_timer_in_interpreter");
-    RECURSIVE_BLOCK(CXX, " in function call");
+
+    // Hacky: this is the best place for EnterRecursiveCall since we want it to be before we set up the frame.
+    // But we already set (and increffed) the globals on the frame.
+    if (Py_EnterRecursiveCall("in function call")) {
+        Py_DECREF(interpreter.frame_info.globals);
+        throwCAPIException();
+    }
+
+    _RecursiveBlockHelper _helper;
 
     return executeInnerAndSetupFrame(interpreter, start_block, start_at);
 }

test/lib/test_helper.py

@@ -77,3 +77,24 @@ def run_test(cmd, cwd, expected, env = None):
         print >> sys.stderr, "expected:", expected
         assert result == expected
 
+class ExpectationFailedException(Exception):
+    pass
+
+class ExpectedException(object):
+    def __init__(self, excs):
+        if isinstance(excs, BaseException):
+            excs = (excs,)
+        self.excs = excs
+
+    def __enter__(self):
+        pass
+
+    def __exit__(self, type, val, tback):
+        if not val:
+            raise ExpectationFailedException("Didn't raise any exception")
+        if not isinstance(val, self.excs):
+            raise ExpectationFailedException("Raised %s instead of %s" % (val, self.excs))
+        print "Caught", type.__name__
+        return True
+expected_exception = ExpectedException
+

test/tests/defaults_test.py

@@ -1,25 +1,9 @@
 # Test for various defaults arguments in builtin functions:
 
-class ExpectationFailedException(Exception):
-    pass
-
-class ExpectedException(object):
-    def __init__(self, excs):
-        if isinstance(excs, BaseException):
-            excs = (excs,)
-        self.excs = excs
-
-    def __enter__(self):
-        pass
-
-    def __exit__(self, type, val, tback):
-        if not val:
-            raise ExpectationFailedException("Didn't raise any exception")
-        if not isinstance(val, self.excs):
-            raise ExpectationFailedException("Raised %s instead of %s" % (val, self.excs))
-        print "Caught", type.__name__
-        return True
-expected_exception = ExpectedException
+import os
+import sys
+sys.path.append(os.path.dirname(__file__) + "/../lib")
+from test_helper import expected_exception
 
 d = {}
 print d.get(1)

test/tests/exceptions_test.py

@@ -1,27 +1,11 @@
-class TestException(Exception):
-    pass
+import os
+import sys
+sys.path.append(os.path.dirname(__file__) + "/../lib")
+from test_helper import expected_exception, ExpectationFailedException
 
-class ExpectationFailedException(Exception):
+class TestException(Exception):
     pass
 
-class ExpectedException(object):
-    def __init__(self, excs):
-        if isinstance(excs, BaseException):
-            excs = (excs,)
-        self.excs = excs
-
-    def __enter__(self):
-        pass
-
-    def __exit__(self, type, val, tback):
-        if not val:
-            raise ExpectationFailedException("Didn't raise any exception")
-        if not isinstance(val, self.excs):
-            raise ExpectationFailedException("Raised %s instead of %s" % (val, self.excs))
-        print "Caught", type.__name__
-        return True
-expected_exception = ExpectedException
-
 # Test the expected_exception manager:
 with expected_exception(Exception):
     raise Exception()

test/tests/recursion_checking.py

@@ -0,0 +1,39 @@
+# Make sure that all of these cases get recursion-checked appropriately
+
+import os
+import sys
+sys.path.append(os.path.dirname(__file__) + "/../lib")
+from test_helper import expected_exception
+
+l = []
+l2 = []
+l.append(l)
+l2.append(l2)
+
+with expected_exception(RuntimeError):
+    l == l2
+
+def recurse():
+    recurse()
+
+with expected_exception(RuntimeError):
+    recurse()
+
+def f(n):
+    if n > 0:
+        f(n-1)
+
+# If the 'exec' itself is the frame that triggers the recursion depth error,
+# it will fail in an obscure way: "KeyError: 'unknown symbol table entry'"
+# (This is because it fails during the compilation of the exec'd string.)
+# So add some other calls just to try to avoid that
+s = """
+f(10)
+exec s
+"""
+with expected_exception(RuntimeError):
+    exec s
+
+s = 'f(10), eval(s)'
+with expected_exception(RuntimeError):
+    eval(s)

test/tests/recursion_checking_llvm.py

@@ -0,0 +1,18 @@
+# expected: fail
+# - Recursion that happens entirely within the llvm tier does not get depth-checked
+
+import os
+import sys
+sys.path.append(os.path.dirname(__file__) + "/../lib")
+from test_helper import expected_exception
+
+def f(n):
+    if n > 0:
+        f(n-1)
+
+# force llvm-tier:
+for i in xrange(3000):
+    f(5)
+
+with expected_exception(RuntimeError):
+    f(100000000)

tools/tester.py

@@ -66,6 +66,7 @@ def set_ulimits():
 
     MAX_MEM_MB = 100
     resource.setrlimit(resource.RLIMIT_RSS, (MAX_MEM_MB * 1024 * 1024, MAX_MEM_MB * 1024 * 1024))
+    resource.setrlimit(resource.RLIMIT_AS, ((MAX_MEM_MB * 1.5) * 1024 * 1024, (MAX_MEM_MB * 1.5) * 1024 * 1024))
 
 EXTMODULE_DIR = None
 EXTMODULE_DIR_PYSTON = None