Revert "gh-137838: Fix JIT trace buffer overrun by pre-reserving exit stub space"

This reverts commit 0776a59.

Author: corona10

Lib/test/test_sys_settrace.py

@@ -13,7 +13,6 @@
 import textwrap
 import subprocess
 import warnings
-
 try:
     import _testinternalcapi
 except ImportError:
@@ -361,8 +360,6 @@ class TraceTestCase(unittest.TestCase):
     # Disable gc collection when tracing, otherwise the
     # deallocators may be traced as well.
     def setUp(self):
-        if os.environ.get('PYTHON_UOPS_OPTIMIZE') == '0':
-            self.skipTest("Line tracing behavior differs when JIT optimizer is disabled")
         self.using_gc = gc.isenabled()
         gc.disable()
         self.addCleanup(sys.settrace, sys.gettrace())

Lib/test/test_trace.py

@@ -142,8 +142,6 @@ def test_traced_func_linear(self):
 
         self.assertEqual(self.tracer.results().counts, expected)
 
-    @unittest.skipIf(os.environ.get('PYTHON_UOPS_OPTIMIZE') == '0',
-                     "Line counts differ when JIT optimizer is disabled")
     def test_traced_func_loop(self):
         self.tracer.runfunc(traced_func_loop, 2, 3)
 
@@ -168,8 +166,6 @@ def test_traced_func_importing(self):
 
         self.assertEqual(self.tracer.results().counts, expected)
 
-    @unittest.skipIf(os.environ.get('PYTHON_UOPS_OPTIMIZE') == '0',
-                     "Line counts differ when JIT optimizer is disabled")
     def test_trace_func_generator(self):
         self.tracer.runfunc(traced_func_calling_generator)
 
@@ -240,8 +236,6 @@ def setUp(self):
         self.my_py_filename = fix_ext_py(__file__)
         self.addCleanup(sys.settrace, sys.gettrace())
 
-    @unittest.skipIf(os.environ.get('PYTHON_UOPS_OPTIMIZE') == '0',
-                     "Line counts differ when JIT optimizer is disabled")
     def test_exec_counts(self):
         self.tracer = Trace(count=1, trace=0, countfuncs=0, countcallers=0)
         code = r'''traced_func_loop(2, 5)'''

Python/optimizer.c

@@ -540,7 +540,6 @@ add_to_trace(
     assert(func == NULL || func->func_code == (PyObject *)code); \
     instr = trace_stack[trace_stack_depth].instr;
 
-
 /* Returns the length of the trace on success,
  * 0 if it failed to produce a worthwhile trace,
  * and -1 on an error.
@@ -561,10 +560,8 @@ translate_bytecode_to_trace(
     _Py_BloomFilter_Add(dependencies, initial_code);
     _Py_CODEUNIT *initial_instr = instr;
     int trace_length = 0;
-    // Leave space for possible trailing _EXIT_TRACE and estimated exit stubs
-    // Reserve 20% of buffer space for exit stubs (empirically sufficient)
-    int max_exit_stubs = (buffer_size * 20) / 100; // 20% for exit stubs
-    int max_length = buffer_size - 2 - max_exit_stubs;
+    // Leave space for possible trailing _EXIT_TRACE
+    int max_length = buffer_size-2;
     struct {
         PyFunctionObject *func;
         PyCodeObject *code;
@@ -650,7 +647,16 @@ translate_bytecode_to_trace(
             assert(!OPCODE_HAS_DEOPT(opcode));
         }
 
-        // Note: Exit stub space is pre-reserved in max_length calculation above
+        if (OPCODE_HAS_EXIT(opcode)) {
+            // Make space for side exit and final _EXIT_TRACE:
+            RESERVE_RAW(2, "_EXIT_TRACE");
+            max_length--;
+        }
+        if (OPCODE_HAS_ERROR(opcode)) {
+            // Make space for error stub and final _EXIT_TRACE:
+            RESERVE_RAW(2, "_ERROR_POP_N");
+            max_length--;
+        }
         switch (opcode) {
             case POP_JUMP_IF_NONE:
             case POP_JUMP_IF_NOT_NONE:
@@ -725,11 +731,9 @@ translate_bytecode_to_trace(
             {
                 const struct opcode_macro_expansion *expansion = &_PyOpcode_macro_expansion[opcode];
                 if (expansion->nuops > 0) {
-                    // Reserve space for nuops
+                    // Reserve space for nuops (+ _SET_IP + _EXIT_TRACE)
                     int nuops = expansion->nuops;
-
-                    // Reserve space for nuops (exit stub space already pre-reserved)
-                    RESERVE(nuops);
+                    RESERVE(nuops + 1); /* One extra for exit */
                     int16_t last_op = expansion->uops[nuops-1].uop;
                     if (last_op == _RETURN_VALUE || last_op == _RETURN_GENERATOR || last_op == _YIELD_VALUE) {
                         // Check for trace stack underflow now: