Address review comments

Author: markshannon

Include/internal/pycore_magic_number.h

@@ -261,7 +261,7 @@ Known values:
     Python 3.14a1 3606 (Specialize CALL_KW)
     Python 3.14a1 3607 (Add pseudo instructions JUMP_IF_TRUE/FALSE)
     Python 3.14a1 3608 (Add support for slices)
-    Python 3.14a2 3609 (Add LOAD_INT and LOAD_CONST_IMMORTAL instructions)
+    Python 3.14a2 3609 (Add LOAD_INT and LOAD_CONST_IMMORTAL instructions, remove RETURN_CONST)
 
     Python 3.15 will start with 3650
 

Lib/test/test_ast/test_ast.py

@@ -2303,7 +2303,7 @@ def get_load_const(self, tree):
         co = compile(tree, '<string>', 'exec')
         consts = []
         for instr in dis.get_instructions(co):
-            if instr.opname in ('LOAD_CONST', 'LOAD_CONST_IMMORTAL', 'LOAD_INT'):
+            if instr.opcode in dis.hasconst:
                 consts.append(instr.argval)
         return consts
 

Misc/NEWS.d/next/Core_and_Builtins/2024-10-25-15-56-14.gh-issue-125837.KlCdgD.rst

@@ -2,3 +2,4 @@ Adds :opcode:`LOAD_INT` and :opcode:`LOAD_CONST_IMMORTAL` instructions.
 ``LOAD_INT`` pushes a small integer equal to the ``oparg`` to the stack.
 ``LOAD_CONST_IMMORTAL`` does the same as ``LOAD_CONST`` but is more
 efficient for immortal objects.
+Removes ``RETRUN_CONST``  instruction.

Python/codegen.c

@@ -665,7 +665,7 @@ codegen_setup_annotations_scope(compiler *c, location loc,
                             key, loc.lineno, NULL, &umd));
 
     // Insert None into consts to prevent an annotation
-    // apperaing to be a docstring
+    // appearing to be a docstring
     _PyCompile_AddConst(c, Py_None);
     // if .format != 1: raise NotImplementedError
     _Py_DECLARE_STR(format, ".format");

Python/flowgraph.c

@@ -2419,7 +2419,7 @@ convert_pseudo_conditional_jumps(cfg_builder *g)
 }
 
 static int
-convert_pseudo_ops(cfg_builder *g, int is_generator)
+convert_pseudo_ops(cfg_builder *g)
 {
     basicblock *entryblock = g->g_entryblock;
     for (basicblock *b = entryblock; b != NULL; b = b->b_next) {

Python/specialize.c

@@ -448,6 +448,7 @@ _PyCode_Quicken(PyCodeObject *code)
     for (int i = 0; i < Py_SIZE(code)-1; i++) {
         opcode = instructions[i].op.code;
         int caches = _PyOpcode_Caches[opcode];
+        oparg = (oparg << 8) | instructions[i].op.arg;
         if (caches) {
             // The initial value depends on the opcode
             switch (opcode) {
@@ -469,16 +470,13 @@ _PyCode_Quicken(PyCodeObject *code)
         else if (opcode == LOAD_CONST) {
             /* We can't do this in the bytecode compiler as
              * marshalling can intern strings and make them immortal. */
-            oparg = (oparg << 8) | instructions[i].op.arg;
+
             PyObject *obj = PyTuple_GET_ITEM(code->co_consts, oparg);
             if (_Py_IsImmortal(obj)) {
                 instructions[i].op.code = LOAD_CONST_IMMORTAL;
             }
         }
-        if (opcode == EXTENDED_ARG) {
-            oparg = (oparg << 8) | instructions[i].op.arg;
-        }
-        else {
+        if (opcode != EXTENDED_ARG) {
             oparg = 0;
         }
     }