https://github.com/python/cpython/commit/05fc4d758aa9b731c722e6c1c18e1f5e54597393
commit: 05fc4d758aa9b731c722e6c1c18e1f5e54597393
branch: main
author: Irit Katriel <[email protected]>
committer: iritkatriel <[email protected]>
date: 2024-08-14T06:17:04+01:00
summary:
gh-122985: add SYMBOL_TO_SCOPE macro in symtable (#122986)
files:
M Include/internal/pycore_symtable.h
M Python/compile.c
M Python/symtable.c
diff --git a/Include/internal/pycore_symtable.h
b/Include/internal/pycore_symtable.h
index b449e8b9dcd91f..7e3d45adcecc1a 100644
--- a/Include/internal/pycore_symtable.h
+++ b/Include/internal/pycore_symtable.h
@@ -171,6 +171,7 @@ extern PyObject* _Py_Mangle(PyObject *p, PyObject *name);
*/
#define SCOPE_OFFSET 12
#define SCOPE_MASK (DEF_GLOBAL | DEF_LOCAL | DEF_PARAM | DEF_NONLOCAL)
+#define SYMBOL_TO_SCOPE(S) (((S) >> SCOPE_OFFSET) & SCOPE_MASK)
#define LOCAL 1
#define GLOBAL_EXPLICIT 2
diff --git a/Python/compile.c b/Python/compile.c
index 0efa7470da4b04..237b5dba0497fd 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -491,7 +491,7 @@ each key.
static PyObject *
dictbytype(PyObject *src, int scope_type, int flag, Py_ssize_t offset)
{
- Py_ssize_t i = offset, scope, num_keys, key_i;
+ Py_ssize_t i = offset, num_keys, key_i;
PyObject *k, *v, *dest = PyDict_New();
PyObject *sorted_keys;
@@ -533,10 +533,7 @@ dictbytype(PyObject *src, int scope_type, int flag,
Py_ssize_t offset)
Py_DECREF(dest);
return NULL;
}
- /* XXX this should probably be a macro in symtable.h */
- scope = (vi >> SCOPE_OFFSET) & SCOPE_MASK;
-
- if (scope == scope_type || vi & flag) {
+ if (SYMBOL_TO_SCOPE(vi) == scope_type || vi & flag) {
PyObject *item = PyLong_FromSsize_t(i);
if (item == NULL) {
Py_DECREF(sorted_keys);
@@ -5393,7 +5390,7 @@ push_inlined_comprehension_state(struct compiler *c,
location loc,
if (symbol == -1 && PyErr_Occurred()) {
return ERROR;
}
- long scope = (symbol >> SCOPE_OFFSET) & SCOPE_MASK;
+ long scope = SYMBOL_TO_SCOPE(symbol);
PyObject *outv =
PyDict_GetItemWithError(SYMTABLE_ENTRY(c)->ste_symbols, k);
if (outv == NULL) {
if (PyErr_Occurred()) {
@@ -5405,7 +5402,7 @@ push_inlined_comprehension_state(struct compiler *c,
location loc,
if (outsymbol == -1 && PyErr_Occurred()) {
return ERROR;
}
- long outsc = (outsymbol >> SCOPE_OFFSET) & SCOPE_MASK;
+ long outsc = SYMBOL_TO_SCOPE(outsymbol);
// If a name has different scope inside than outside the comprehension,
// we need to temporarily handle it with the right scope while
// compiling the comprehension. If it's free in the comprehension
diff --git a/Python/symtable.c b/Python/symtable.c
index 527bc367e8ea6e..8bc9db6d7d6811 100644
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -551,7 +551,7 @@ _PyST_GetScope(PySTEntryObject *ste, PyObject *name)
if (symbol < 0) {
return -1;
}
- return (symbol >> SCOPE_OFFSET) & SCOPE_MASK;
+ return SYMBOL_TO_SCOPE(symbol);
}
int
@@ -809,7 +809,7 @@ inline_comprehension(PySTEntryObject *ste, PySTEntryObject
*comp,
assert(_PyUnicode_EqualToASCIIString(k, ".0"));
continue;
}
- int scope = (comp_flags >> SCOPE_OFFSET) & SCOPE_MASK;
+ int scope = SYMBOL_TO_SCOPE(comp_flags);
int only_flags = comp_flags & ((1 << SCOPE_OFFSET) - 1);
if (scope == CELL || only_flags & DEF_COMP_CELL) {
if (PySet_Add(inlined_cells, k) < 0) {
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
