Skip to content

Commit

Permalink
pythongh-109195: fix source location for super load before LOAD_SUPER…
Browse files Browse the repository at this point in the history
…_ATTR
  • Loading branch information
carljm committed Sep 11, 2023
1 parent 4a69301 commit cc4b751
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
7 changes: 7 additions & 0 deletions Lib/test/test_compile.py
Original file line number Diff line number Diff line change
Expand Up @@ -1751,6 +1751,13 @@ def test_column_offset_deduplication(self):
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):
# These tests check that the computed stack size for a code object
Expand Down
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 1 deletion Python/compile.c
Original file line number Diff line number Diff line change
Expand Up @@ -4868,7 +4868,7 @@ load_args_for_super(struct compiler *c, expr_ty e) {

// load super() global
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) {
VISIT(c, expr, asdl_seq_GET(e->v.Call.args, 0));
Expand Down

0 comments on commit cc4b751

Please sign in to comment.