fix default builkd

Author: Fidget-Spinner

Lib/test/test_capi/test_opt.py

@@ -2487,6 +2487,7 @@ def testfunc(n):
 
         self.assertIn("_POP_TOP_NOP", uops)
 
+    @unittest.skipIf(Py_GIL_DISABLED, "FT build immortalizes constants")
     def test_pop_top_specialize_int(self):
         def testfunc(n):
             for _ in range(n):
@@ -2500,6 +2501,7 @@ def testfunc(n):
 
         self.assertIn("_POP_TOP_INT", uops)
 
+    @unittest.skipIf(Py_GIL_DISABLED, "FT build immortalizes constants")
     def test_pop_top_specialize_float(self):
         def testfunc(n):
             for _ in range(n):

Python/bytecodes.c

@@ -3018,22 +3018,18 @@ dummy_func(
                 goto stop_tracing;
             }
             PyCodeObject *code = _PyFrame_GetCode(frame);
-#ifdef Py_GIL_DISABLED
+
             LOCK_OBJECT_SLOW(code);
             _PyExecutorObject *executor = code->co_executors->executors[oparg & 255];
             // On FT, we are responsible for cleaning up after ourselves.
-            if (!_Py_atomic_load_uint8_relaxed(&executor->vm_data.valid)) {
+            if (!FT_ATOMIC_LOAD_UINT8_RELAXED(executor->vm_data.valid)) {
                 opcode = executor->vm_data.opcode;
                 oparg = (oparg & ~255) | executor->vm_data.oparg;
                 next_instr = this_instr;
                 _Py_ExecutorDetach(executor);
                 UNLOCK_OBJECT_SLOW(code);
                 DISPATCH_GOTO();
             }
-#else
-            _PyExecutorObject *executor = code->co_executors->executors[oparg & 255];
-            assert(executor->vm_data.valid);
-#endif
             assert(tstate->current_executor == NULL);
             assert(executor->vm_data.index == INSTR_OFFSET() - 1);
             assert(executor->vm_data.code == code);

Python/generated_cases.c.h

@@ -1657,7 +1657,9 @@ _Py_ExecutorDetach(_PyExecutorObject *executor)
     if (code == NULL) {
         return;
     }
+#ifdef Py_GIL_DISABLED
     assert(_PyInterpreterState_GET()->stoptheworld.world_stopped || PyMutex_IsLocked(&((PyObject *)code)->ob_mutex));
+#endif
     _Py_CODEUNIT *instruction = &_PyCode_CODE(code)[executor->vm_data.index];
     assert(instruction->op.code == ENTER_EXECUTOR);
     int index = instruction->op.arg;