Address code review

Author: corona10

Include/internal/pycore_tstate.h

@@ -78,7 +78,7 @@ typedef struct _PyThreadStateImpl {
 #endif
 
 #ifdef _Py_TIER2
-    struct _PyUOpInstruction *buffer;
+    struct _PyUOpInstruction *jit_uop_buffer;
 #endif
 
 } _PyThreadStateImpl;

Python/optimizer.c

@@ -1281,14 +1281,13 @@ uop_optimize(
     _PyBloomFilter dependencies;
     _Py_BloomFilter_Init(&dependencies);
     _PyThreadStateImpl *tstate = (_PyThreadStateImpl *)_PyThreadState_GET();
-    if (tstate->buffer == NULL) {
-        tstate->buffer = (_PyUOpInstruction *)PyMem_RawMalloc(UOP_MAX_TRACE_LENGTH*sizeof(_PyUOpInstruction));
-        if (tstate->buffer == NULL) {
-            PyErr_NoMemory();
+    if (tstate->jit_uop_buffer == NULL) {
+        tstate->jit_uop_buffer = (_PyUOpInstruction *)PyMem_RawMalloc(UOP_MAX_TRACE_LENGTH*sizeof(_PyUOpInstruction));
+        if (tstate->jit_uop_buffer == NULL) {
             return -1;
         }
     }
-    _PyUOpInstruction *buffer = tstate->buffer;
+    _PyUOpInstruction *buffer = tstate->jit_uop_buffer;
     OPT_STAT_INC(attempts);
     char *env_var = Py_GETENV("PYTHON_UOPS_OPTIMIZE");
     bool is_noopt = true;

Python/pylifecycle.c

@@ -863,10 +863,6 @@ pycore_interp_init(PyThreadState *tstate)
     if (_tstate->c_stack_hard_limit == 0) {
         _Py_InitializeRecursionLimits(tstate);
     }
-#ifdef _Py_TIER2
-     // Ensure the buffer is to be set as NULL for MSVC
-    _tstate->buffer = NULL;
-#endif
     PyInterpreterState *interp = tstate->interp;
     PyStatus status;
     PyObject *sysmod = NULL;
@@ -1708,11 +1704,6 @@ finalize_modules(PyThreadState *tstate)
     interp->jit = false;
 #ifdef _Py_TIER2
     _Py_Executors_InvalidateAll(interp, 0);
-    _PyThreadStateImpl *_tstate = (_PyThreadStateImpl *)tstate;
-    if (_tstate->buffer != NULL) {
-        PyMem_RawFree(_tstate->buffer);
-        _tstate->buffer = NULL;
-    }
 #endif
 
     // Stop watching __builtin__ modifications

Python/pystate.c

@@ -1536,6 +1536,11 @@ new_threadstate(PyInterpreterState *interp, int whence)
     }
 #endif
 
+#ifdef _Py_TIER2
+     // Ensure the buffer is to be set as NULL for MSVC
+    tstate->jit_uop_buffer = NULL;
+#endif
+
     /* We serialize concurrent creation to protect global state. */
     HEAD_LOCK(interp->runtime);
 
@@ -1726,6 +1731,14 @@ PyThreadState_Clear(PyThreadState *tstate)
     _Py_ClearTLBCIndex((_PyThreadStateImpl *)tstate);
 #endif
 
+#ifdef _Py_TIER2
+    _PyThreadStateImpl *_tstate = (_PyThreadStateImpl *)tstate;
+    if (_tstate->jit_uop_buffer != NULL) {
+        PyMem_RawFree(_tstate->jit_uop_buffer);
+        _tstate->jit_uop_buffer = NULL;
+    }
+#endif
+
     // Merge our queue of pointers to be freed into the interpreter queue.
     _PyMem_AbandonDelayed(tstate);