1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gh-109195: fix source location for super load before LOAD_SUPER_ATTR (#109289)

Browse Source
This commit is contained in:
Carl Meyer 2023-09-11 17:35:49 -06:00 committed by GitHub
parent fbaf77eb9b
commit ceeb4173ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Lib/test/test_compile.py
View File

@ -1751,6 +1751,13 @@ class TestSourcePositions(unittest.TestCase):
list(code.co_consts[1].co_positions()), list(code.co_consts[1].co_positions()),
) )
def test_load_super_attr(self):
source = "class C:\n def __init__(self):\n super().__init__()"
code = compile(source, "<test>", "exec").co_consts[0].co_consts[1]
self.assertOpcodeSourcePositionIs(
code, "LOAD_GLOBAL", line=3, end_line=3, column=4, end_column=9
)
class TestExpressionStackSize(unittest.TestCase): class TestExpressionStackSize(unittest.TestCase):
# These tests check that the computed stack size for a code object # These tests check that the computed stack size for a code object

4
Misc/NEWS.d/next/Core and Builtins/2023-09-11-15-51-55.gh-issue-109195.iwxmuo.rst Normal file
View File

@ -0,0 +1,4 @@
Fix source location for the ``LOAD_*`` instruction preceding a
``LOAD_SUPER_ATTR`` to load the ``super`` global (or shadowing variable) so
that it encompasses only the name ``super`` and not the following
parentheses.

2
Python/compile.c
View File

@ -4868,7 +4868,7 @@ load_args_for_super(struct compiler *c, expr_ty e) {
// load super() global // load super() global
PyObject *super_name = e->v.Call.func->v.Name.id; PyObject *super_name = e->v.Call.func->v.Name.id;
RETURN_IF_ERROR(compiler_nameop(c, loc, super_name, Load)); RETURN_IF_ERROR(compiler_nameop(c, LOC(e->v.Call.func), super_name, Load));
if (asdl_seq_LEN(e->v.Call.args) == 2) { if (asdl_seq_LEN(e->v.Call.args) == 2) {
VISIT(c, expr, asdl_seq_GET(e->v.Call.args, 0)); VISIT(c, expr, asdl_seq_GET(e->v.Call.args, 0));