Check recursion limit in _PY_FRAME_GENERAL

python · markshannon · May 2, 2025 · Apr 20, 2025 · Apr 20, 2025 · Apr 29, 2025
commit b4434ad3f8ce8e40df45fed78c73942f2a3cce92
diff --git a/Include/internal/pycore_uop_metadata.h b/Include/internal/pycore_uop_metadata.h
diff --git a/Lib/test/test_opcache.py b/Lib/test/test_opcache.py
@@ -550,6 +550,13 @@ def instantiate():
         with self.assertRaises(TypeError):
             instantiate()
 
+    def test_recursion_check_for_general_calls(self):
+        def test(default=None):
+            return test()
+
+        with self.assertRaises(RecursionError):
+            test()
+
 
 def make_deferred_ref_count_obj():
     """Create an object that uses deferred reference counting.

@@ -3756,6 +3756,7 @@ dummy_func(
         macro(INSTRUMENTED_CALL) = unused/3 + _MAYBE_EXPAND_METHOD + _MONITOR_CALL + _DO_CALL + _CHECK_PERIODIC;
 
         op(_PY_FRAME_GENERAL, (callable, self_or_null, args[oparg] -- new_frame: _PyInterpreterFrame*)) {
+            DEOPT_IF(tstate->py_recursion_remaining <= 1);
             PyObject *callable_o = PyStackRef_AsPyObjectBorrow(callable);
 
             // oparg counts all of the args, but *not* self:

diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h