Add some asserts and up limits

Author: markshannon

Lib/test/list_tests.py

@@ -64,7 +64,7 @@ def test_repr(self):
     @skip_emscripten_stack_overflow()
     def test_repr_deep(self):
         a = self.type2test([])
-        for i in range(100_000):
+        for i in range(150_000):
             a = self.type2test([a])
         self.assertRaises(RecursionError, repr, a)
 

Lib/test/support/__init__.py

@@ -2628,7 +2628,7 @@ def adjust_int_max_str_digits(max_digits):
 
 def exceeds_recursion_limit():
     """For recursion tests, easily exceeds default recursion limit."""
-    return 100_000
+    return 150_000
 
 
 # Windows doesn't have os.uname() but it doesn't support s390x.

Lib/test/test_ast/test_ast.py

@@ -755,7 +755,7 @@ def next(self):
     @skip_wasi_stack_overflow()
     @skip_emscripten_stack_overflow()
     def test_ast_recursion_limit(self):
-        crash_depth = 200_000
+        crash_depth = 300_000
         success_depth = 200
         if _testinternalcapi is not None:
             remaining = _testinternalcapi.get_c_recursion_remaining()

Lib/test/test_compile.py

@@ -714,8 +714,8 @@ def test_yet_more_evil_still_undecodable(self):
     def test_compiler_recursion_limit(self):
         # Compiler frames are small
         limit = 100
-        fail_depth = limit * 1000
-        crash_depth = limit * 2000
+        fail_depth = limit * 1500
+        crash_depth = limit * 3000
         success_depth = limit
 
         def check_limit(prefix, repeated, mode="single"):

Python/ceval.c

@@ -360,23 +360,26 @@ _Py_InitializeRecursionLimits(PyThreadState *tstate)
     _tstate->c_stack_hard_limit = ((uintptr_t)low) + guarantee + PYOS_STACK_MARGIN_BYTES;
     _tstate->c_stack_soft_limit = _tstate->c_stack_hard_limit + PYOS_STACK_MARGIN_BYTES;
 #else
+    char here;
+    uintptr_t here_addr = (uintptr_t)&here;
 #  if defined(HAVE_PTHREAD_GETATTR_NP)
     size_t stack_size, guard_size;
     void *stack_addr;
     pthread_attr_t attr;
     int err = pthread_getattr_np(pthread_self(), &attr);
     err |= pthread_attr_getguardsize(&attr, &guard_size);
     err |= pthread_attr_getstack(&attr, &stack_addr, &stack_size);
+    err |= pthread_attr_destroy(&attr);
     if (err == 0) {
         uintptr_t base = ((uintptr_t)stack_addr) + guard_size;
         _tstate->c_stack_top = base + stack_size;
         _tstate->c_stack_soft_limit = base + PYOS_STACK_MARGIN_BYTES * 2;
         _tstate->c_stack_hard_limit = base + PYOS_STACK_MARGIN_BYTES;
+        assert(_tstate->c_stack_soft_limit < here_addr);
+        assert(here_addr < _tstate->c_stack_top);
         return;
     }
 #  endif
-    char here;
-    uintptr_t here_addr = (uintptr_t)&here;
     _tstate->c_stack_top = _Py_SIZE_ROUND_UP(here_addr, 4096);
     _tstate->c_stack_soft_limit = _tstate->c_stack_top - Py_C_STACK_SIZE;
     _tstate->c_stack_hard_limit = _tstate->c_stack_top - (Py_C_STACK_SIZE + PYOS_STACK_MARGIN_BYTES);