Replace KW_NAMES with LOAD_CONST/PUSH_NULL

brandtbucher · Jun 11, 2023 · Jun 15, 2023 · Jun 16, 2023 · Jun 16, 2023 · Jun 16, 2023
commit 28adc9087e963f4b74410d4a8af83d0423358c3f
diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst
@@ -1370,15 +1370,6 @@ iterations of the loop.
    .. versionadded:: 3.11
 
 
-.. opcode:: KW_NAMES (consti)
-
-   Prefixes :opcode:`CALL`.
-   Stores a reference to ``co_consts[consti]`` into an internal variable
-   for use by :opcode:`CALL`. ``co_consts[consti]`` must be a tuple of strings.
-
-   .. versionadded:: 3.11
-
-
 .. opcode:: MAKE_FUNCTION (flags)
 
    Pushes a new function object on the stack.  From bottom to top, the consumed

diff --git a/Include/internal/pycore_opcode.h b/Include/internal/pycore_opcode.h
diff --git a/Include/opcode.h b/Include/opcode.h
diff --git a/Lib/opcode.py b/Lib/opcode.py
@@ -226,8 +226,7 @@ def pseudo_op(name, op, real_ops):
 def_op('STORE_FAST_LOAD_FAST', 169)
 def_op('STORE_FAST_STORE_FAST', 170)
 def_op('CALL', 171)
-def_op('KW_NAMES', 172)
-hasconst.append(172)
+
 def_op('CALL_INTRINSIC_1', 173)
 def_op('CALL_INTRINSIC_2', 174)
 

diff --git a/Lib/test/test_compiler_codegen.py b/Lib/test/test_compiler_codegen.py
@@ -43,6 +43,7 @@ def test_for_loop(self):
             ('PUSH_NULL', None, 2),
             ('LOAD_NAME', 2, 2),
             ('LOAD_NAME', 1, 2),
+            ('PUSH_NULL', None, 2),
             ('CALL', 1, 2),
             ('POP_TOP', None),
             ('JUMP', loop_lbl),

diff --git a/Lib/test/test_dis.py b/Lib/test/test_dis.py
diff --git a/Lib/test/test_monitoring.py b/Lib/test/test_monitoring.py
@@ -838,11 +838,12 @@ def func2():
             ('instruction', 'func2', 8),
             ('instruction', 'func2', 28),
             ('instruction', 'func2', 30),
-            ('instruction', 'func2', 38),
-            ('line', 'func2', 3),
+            ('instruction', 'func2', 32),
             ('instruction', 'func2', 40),
+            ('line', 'func2', 3),
             ('instruction', 'func2', 42),
             ('instruction', 'func2', 44),
+            ('instruction', 'func2', 46),
             ('line', 'check_events', 11)])
 
     def test_try_except(self):
@@ -1158,8 +1159,8 @@ def func():
             ('line', 'func', 5),
             ('line', 'meth', 1),
             ('jump', 'func', 5, 5),
-            ('jump', 'func', 5, '[offset=112]'),
-            ('branch', 'func', '[offset=118]', '[offset=120]'),
+            ('jump', 'func', 5, '[offset=116]'),
+            ('branch', 'func', '[offset=122]', '[offset=124]'),
             ('line', 'check_events', 11)])
 
         self.check_events(func, recorders = FLOW_AND_LINE_RECORDERS, expected = [
@@ -1174,8 +1175,8 @@ def func():
             ('line', 'meth', 1),
             ('return', None),
             ('jump', 'func', 5, 5),
-            ('jump', 'func', 5, '[offset=112]'),
-            ('branch', 'func', '[offset=118]', '[offset=120]'),
+            ('jump', 'func', 5, '[offset=116]'),
+            ('branch', 'func', '[offset=122]', '[offset=124]'),
             ('return', None),
             ('line', 'check_events', 11)])
 

diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
@@ -1446,7 +1446,7 @@ class C(object): pass
         def func():
             return sys._getframe()
         x = func()
-        check(x, size('3Pi3c7P2ic??2P'))
+        check(x, size('3Pi3c7P2ic??3P'))
         # function
         def func(): pass
         check(func, size('15Pi'))

@@ -426,7 +426,7 @@ mark_stacks(PyCodeObject *code_obj, int len)
                 case CALL:
                 {
                     int args = oparg;
-                    for (int j = 0; j < args+2; j++) {
+                    for (int j = 0; j < args+3; j++) {
                         next_stack = pop_value(next_stack);
                     }
                     next_stack = push_value(next_stack, Object);