[3.12] gh-109195: fix source location for super load before LOAD_SUPER_ATTR (GH-10928...

gh-109195: fix source location for super load before LOAD_SUPER_ATTR (GH-109289)
(cherry picked from commit ceeb4173aee7b835f553a8286feaa48b98c16124)

Co-authored-by: Carl Meyer <carl@oddbird.net>

diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py
index 19b5aebdd381983075f572cf1487969f51dfa4f1..16a59c106bbb672fd37cbe4348e41ae4c7ecd1e5 100644 (file)
--- a/Lib/test/test_compile.py
+++ b/Lib/test/test_compile.py
@@ -1742,6 +1742,13 @@ class TestSourcePositions(unittest.TestCase):
                     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

diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-09-11-15-51-55.gh-issue-109195.iwxmuo.rst b/Misc/NEWS.d/next/Core and Builtins/2023-09-11-15-51-55.gh-issue-109195.iwxmuo.rst
new file mode 100644 (file)
index 0000000..5427232
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2023-09-11-15-51-55.gh-issue-109195.iwxmuo.rst
@@ -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.

diff --git a/Python/compile.c b/Python/compile.c
index 9395f5229cf866e683abcadbb71d039ba0aad3a7..b6e5adf1c76418bf7f7c9f5d276bccb32dec9094 100644 (file)
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -4776,7 +4776,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));