gh-135437: Account For Duplicate Names in _PyCode_SetUnboundVarCounts() (gh-135438)

diff --git a/Lib/test/_code_definitions.py b/Lib/test/_code_definitions.py
index 274beb65a6d0f4941993d1852e73b2f4bec3b033..70c44da2ec63822172df00d4bc24f676e6166736 100644 (file)
--- a/Lib/test/_code_definitions.py
+++ b/Lib/test/_code_definitions.py
@@ -57,6 +57,13 @@ def spam_with_globals_and_builtins():
     print(res)
 
 
+def spam_with_global_and_attr_same_name():
+    try:
+        spam_minimal.spam_minimal
+    except AttributeError:
+        pass
+
+
 def spam_full_args(a, b, /, c, d, *args, e, f, **kwargs):
     return (a, b, c, d, e, f, args, kwargs)
 
@@ -190,6 +197,7 @@ TOP_FUNCTIONS = [
     spam_minimal,
     spam_with_builtins,
     spam_with_globals_and_builtins,
+    spam_with_global_and_attr_same_name,
     spam_full_args,
     spam_full_args_with_defaults,
     spam_args_attrs_and_builtins,
@@ -258,6 +266,7 @@ STATELESS_CODE = [
     script_with_globals,
     spam_full_args_with_defaults,
     spam_with_globals_and_builtins,
+    spam_with_global_and_attr_same_name,
     spam_full,
 ]
 
@@ -275,6 +284,7 @@ SCRIPT_FUNCTIONS = [
     *PURE_SCRIPT_FUNCTIONS,
     script_with_globals,
     spam_with_globals_and_builtins,
+    spam_with_global_and_attr_same_name,
 ]
 
 

diff --git a/Lib/test/test_code.py b/Lib/test/test_code.py
index 9fc2b047bef7195574c51228a40172401f63fd63..655f5a9be7fa3181705e5a4417fea288cac62bed 100644 (file)
--- a/Lib/test/test_code.py
+++ b/Lib/test/test_code.py
@@ -701,6 +701,7 @@ class CodeTest(unittest.TestCase):
                 'checks': CO_FAST_LOCAL,
                 'res': CO_FAST_LOCAL,
             },
+            defs.spam_with_global_and_attr_same_name: {},
             defs.spam_full_args: {
                 'a': POSONLY,
                 'b': POSONLY,
@@ -955,6 +956,10 @@ class CodeTest(unittest.TestCase):
                 purelocals=5,
                 globalvars=6,
             ),
+            defs.spam_with_global_and_attr_same_name: new_var_counts(
+                globalvars=2,
+                attrs=1,
+            ),
             defs.spam_full_args: new_var_counts(
                 posonly=2,
                 posorkw=2,

diff --git a/Objects/codeobject.c b/Objects/codeobject.c
index ee869d991d93cd2ab3f29b78d11c0f1a0cc8f2a2..34b50ef97d544b18f5b29b18e0017cd3a51c75da 100644 (file)
--- a/Objects/codeobject.c
+++ b/Objects/codeobject.c
@@ -1714,7 +1714,7 @@ static int
 identify_unbound_names(PyThreadState *tstate, PyCodeObject *co,
                        PyObject *globalnames, PyObject *attrnames,
                        PyObject *globalsns, PyObject *builtinsns,
-                       struct co_unbound_counts *counts)
+                       struct co_unbound_counts *counts, int *p_numdupes)
 {
     // This function is inspired by inspect.getclosurevars().
     // It would be nicer if we had something similar to co_localspluskinds,
@@ -1729,6 +1729,7 @@ identify_unbound_names(PyThreadState *tstate, PyCodeObject *co,
     assert(builtinsns == NULL || PyDict_Check(builtinsns));
     assert(counts == NULL || counts->total == 0);
     struct co_unbound_counts unbound = {0};
+    int numdupes = 0;
     Py_ssize_t len = Py_SIZE(co);
     for (int i = 0; i < len; i += _PyInstruction_GetLength(co, i)) {
         _Py_CODEUNIT inst = _Py_GetBaseCodeUnit(co, i);
@@ -1747,6 +1748,12 @@ identify_unbound_names(PyThreadState *tstate, PyCodeObject *co,
             if (PySet_Add(attrnames, name) < 0) {
                 return -1;
             }
+            if (PySet_Contains(globalnames, name)) {
+                if (_PyErr_Occurred(tstate)) {
+                    return -1;
+                }
+                numdupes += 1;
+            }
         }
         else if (inst.op.code == LOAD_GLOBAL) {
             int oparg = GET_OPARG(co, i, inst.op.arg);
@@ -1778,11 +1785,20 @@ identify_unbound_names(PyThreadState *tstate, PyCodeObject *co,
             if (PySet_Add(globalnames, name) < 0) {
                 return -1;
             }
+            if (PySet_Contains(attrnames, name)) {
+                if (_PyErr_Occurred(tstate)) {
+                    return -1;
+                }
+                numdupes += 1;
+            }
         }
     }
     if (counts != NULL) {
         *counts = unbound;
     }
+    if (p_numdupes != NULL) {
+        *p_numdupes = numdupes;
+    }
     return 0;
 }
 
@@ -1932,20 +1948,24 @@ _PyCode_SetUnboundVarCounts(PyThreadState *tstate,
 
     // Fill in unbound.globals and unbound.numattrs.
     struct co_unbound_counts unbound = {0};
+    int numdupes = 0;
     Py_BEGIN_CRITICAL_SECTION(co);
     res = identify_unbound_names(
             tstate, co, globalnames, attrnames, globalsns, builtinsns,
-            &unbound);
+            &unbound, &numdupes);
     Py_END_CRITICAL_SECTION();
     if (res < 0) {
         goto finally;
     }
     assert(unbound.numunknown == 0);
-    assert(unbound.total <= counts->unbound.total);
+    assert(unbound.total - numdupes <= counts->unbound.total);
     assert(counts->unbound.numunknown == counts->unbound.total);
-    unbound.numunknown = counts->unbound.total - unbound.total;
-    unbound.total = counts->unbound.total;
+    // There may be a name that is both a global and an attr.
+    int totalunbound = counts->unbound.total + numdupes;
+    unbound.numunknown = totalunbound - unbound.total;
+    unbound.total = totalunbound;
     counts->unbound = unbound;
+    counts->total += numdupes;
     res = 0;
 
 finally: