Restore a test, address review

diff --git a/Include/internal/pycore_interp_structs.h b/Include/internal/pycore_interp_structs.h
index 39023923c7e2b710d758254c772aaee587bbcf21..516a4c3595e3fa29380b2d99f4944b8b1de0d307 100644 (file)
--- a/Include/internal/pycore_interp_structs.h
+++ b/Include/internal/pycore_interp_structs.h
@@ -755,7 +755,6 @@ struct _Py_unique_id_pool {
 
 typedef _Py_CODEUNIT *(*_PyJitEntryFuncPtr)(struct _PyExecutorObject *exec, _PyInterpreterFrame *frame, _PyStackRef *stack_pointer, PyThreadState *tstate);
 
-
 /* PyInterpreterState holds the global state for one of the runtime's
    interpreters.  Typically the initial (main) interpreter is the only one.
 

diff --git a/Lib/test/test_capi/test_opt.py b/Lib/test/test_capi/test_opt.py
index 10b308c0aafab5e6d22a733f1b0678703320316e..6c866c5833aff731faa44973a64c06999d999f34 100644 (file)
--- a/Lib/test/test_capi/test_opt.py
+++ b/Lib/test/test_capi/test_opt.py
@@ -139,7 +139,6 @@ class TestUops(unittest.TestCase):
         self.assertIn("_JUMP_TO_TOP", uops)
         self.assertIn("_LOAD_FAST_BORROW_0", uops)
 
-    @unittest.skip("gh-139109 WIP")
     def test_extended_arg(self):
         "Check EXTENDED_ARG handling in superblock creation"
         ns = {}

diff --git a/Python/optimizer.c b/Python/optimizer.c
index cee0f29efbfb60d45a9881e9b8f34f316c25e1d4..8443476dfa95d1cda8378ba971f8002036cb12ed 100644 (file)
--- a/Python/optimizer.c
+++ b/Python/optimizer.c
@@ -125,10 +125,6 @@ _PyOptimizer_Optimize(
     assert(!interp->compiling);
     assert(_tstate->jit_tracer_state.initial_state.stack_depth >= 0);
 #ifndef Py_GIL_DISABLED
-    // Trace got stomped on by another thread.
-    if (_tstate->jit_tracer_state.initial_state.func == NULL) {
-        return 0;
-    }
     assert(_tstate->jit_tracer_state.initial_state.func != NULL);
     interp->compiling = true;
     // The first executor in a chain and the MAX_CHAIN_DEPTH'th executor *must*