Pass tstate to _PyCode_SetUnboundVarCounts().

Author: ericsnowcurrently

Include/internal/pycore_code.h

@@ -607,6 +607,7 @@ PyAPI_FUNC(void) _PyCode_GetVarCounts(
         PyCodeObject *,
         _PyCode_var_counts_t *);
 PyAPI_FUNC(int) _PyCode_SetUnboundVarCounts(
+        PyThreadState *,
         PyCodeObject *,
         _PyCode_var_counts_t *,
         PyObject *globalnames,

Modules/_testinternalcapi.c

@@ -1002,6 +1002,7 @@ get_co_localskinds(PyObject *self, PyObject *arg)
 static PyObject *
 get_code_var_counts(PyObject *self, PyObject *_args, PyObject *_kwargs)
 {
+    PyThreadState *tstate = _PyThreadState_GET();
     PyObject *codearg;
     PyObject *globalnames = NULL;
     PyObject *attrnames = NULL;
@@ -1035,7 +1036,8 @@ get_code_var_counts(PyObject *self, PyObject *_args, PyObject *_kwargs)
     _PyCode_var_counts_t counts = {0};
     _PyCode_GetVarCounts(code, &counts);
     if (_PyCode_SetUnboundVarCounts(
-            code, &counts, globalnames, attrnames, globalsns, builtinsns) < 0)
+            tstate, code, &counts, globalnames, attrnames,
+            globalsns, builtinsns) < 0)
     {
         return NULL;
     }

Objects/codeobject.c

@@ -1691,7 +1691,7 @@ PyCode_GetFreevars(PyCodeObject *code)
 
 
 static int
-identify_unbound_names(PyCodeObject *co,
+identify_unbound_names(PyThreadState *tstate, PyCodeObject *co,
                        PyObject *globalnames, PyObject *attrnames,
                        PyObject *globalsns, PyObject *builtinsns,
                        struct co_unbound_counts *counts)
@@ -1715,7 +1715,7 @@ identify_unbound_names(PyCodeObject *co,
             PyObject *name = PyTuple_GET_ITEM(co->co_names, inst.op.arg>>1);
             if (counts != NULL) {
                 if (PySet_Contains(attrnames, name)) {
-                    if (PyErr_Occurred()) {
+                    if (_PyErr_Occurred(tstate)) {
                         return -1;
                     }
                     continue;
@@ -1731,7 +1731,7 @@ identify_unbound_names(PyCodeObject *co,
             PyObject *name = PyTuple_GET_ITEM(co->co_names, inst.op.arg>>1);
             if (counts != NULL) {
                 if (PySet_Contains(globalnames, name)) {
-                    if (PyErr_Occurred()) {
+                    if (_PyErr_Occurred(tstate)) {
                         return -1;
                     }
                     continue;
@@ -1740,14 +1740,14 @@ identify_unbound_names(PyCodeObject *co,
                 counts->globals.total += 1;
                 counts->globals.numunknown += 1;
                 if (globalsns != NULL && PyDict_Contains(globalsns, name)) {
-                    if (PyErr_Occurred()) {
+                    if (_PyErr_Occurred(tstate)) {
                         return -1;
                     }
                     counts->globals.numglobal += 1;
                     counts->globals.numunknown -= 1;
                 }
                 if (builtinsns != NULL && PyDict_Contains(builtinsns, name)) {
-                    if (PyErr_Occurred()) {
+                    if (_PyErr_Occurred(tstate)) {
                         return -1;
                     }
                     counts->globals.numbuiltin += 1;
@@ -1866,7 +1866,8 @@ _PyCode_GetVarCounts(PyCodeObject *co, _PyCode_var_counts_t *counts)
 }
 
 int
-_PyCode_SetUnboundVarCounts(PyCodeObject *co, _PyCode_var_counts_t *counts,
+_PyCode_SetUnboundVarCounts(PyThreadState *tstate,
+                            PyCodeObject *co, _PyCode_var_counts_t *counts,
                             PyObject *globalnames, PyObject *attrnames,
                             PyObject *globalsns, PyObject *builtinsns)
 {
@@ -1881,7 +1882,7 @@ _PyCode_SetUnboundVarCounts(PyCodeObject *co, _PyCode_var_counts_t *counts,
         globalnames = globalnames_owned;
     }
     else if (!PySet_Check(globalnames)) {
-        PyErr_Format(PyExc_TypeError,
+        _PyErr_Format(tstate, PyExc_TypeError,
                      "expected a set for \"globalnames\", got %R", globalnames);
         goto finally;
     }
@@ -1893,14 +1894,15 @@ _PyCode_SetUnboundVarCounts(PyCodeObject *co, _PyCode_var_counts_t *counts,
         attrnames = attrnames_owned;
     }
     else if (!PySet_Check(attrnames)) {
-        PyErr_Format(PyExc_TypeError,
+        _PyErr_Format(tstate, PyExc_TypeError,
                      "expected a set for \"attrnames\", got %R", attrnames);
         goto finally;
     }
 
     struct co_unbound_counts unbound = {0};
     if (identify_unbound_names(
-            co, globalnames, attrnames, globalsns, builtinsns, &unbound) < 0)
+            tstate, co, globalnames, attrnames, globalsns, builtinsns,
+            &unbound) < 0)
     {
         goto finally;
     }