Don't mark LOAD_SMALL_INT as having a constant, as it doesn't load from code.co_consts

Author: markshannon

Include/internal/pycore_opcode_metadata.h

@@ -673,7 +673,7 @@ def _get_const_value(op, arg, co_consts):
        Otherwise (if it is a LOAD_CONST and co_consts is not
        provided) returns the dis.UNKNOWN sentinel.
     """
-    assert op in hasconst
+    assert op in hasconst or op == LOAD_SMALL_INT
 
     if op == LOAD_SMALL_INT:
         return arg
@@ -993,7 +993,8 @@ def _find_imports(co):
         if op == IMPORT_NAME and i >= 2:
             from_op = opargs[i-1]
             level_op = opargs[i-2]
-            if (from_op[0] in hasconst and level_op[0] in hasconst):
+            if (from_op[0] in hasconst and
+                (level_op[0] in hasconst or level_op[0] == LOAD_SMALL_INT)):
                 level = _get_const_value(level_op[0], level_op[1], consts)
                 fromlist = _get_const_value(from_op[0], from_op[1], consts)
                 yield (names[oparg], level, fromlist)

Include/internal/pycore_uop_metadata.h

@@ -2311,7 +2311,6 @@ def get_load_const(self, tree):
     def test_load_const(self):
         consts = [None,
                   True, False,
-                  124,
                   2.0,
                   3j,
                   "unicode",

Lib/dis.py

@@ -270,8 +270,6 @@ dummy_func(
         }
 
         replicate(4) inst(LOAD_SMALL_INT, (-- value)) {
-            /* Tell code generator that this is a const load */
-            (void)FRAME_CO_CONSTS;
             assert(oparg < _PY_NSMALLPOSINTS);
             PyObject *obj = (PyObject *)&_PyLong_SMALL_INTS[_PY_NSMALLNEGINTS + oparg];
             value = PyStackRef_FromPyObjectImmortal(obj);

Lib/test/test_ast/test_ast.py

@@ -1264,11 +1264,17 @@ jump_thread(basicblock *bb, cfg_instr *inst, cfg_instr *target, int opcode)
     return false;
 }
 
+static int
+loads_const(int opcode)
+{
+    return OPCODE_HAS_CONST(opcode) || opcode == LOAD_SMALL_INT;
+}
+
 static PyObject*
 get_const_value(int opcode, int oparg, PyObject *co_consts)
 {
     PyObject *constant = NULL;
-    assert(OPCODE_HAS_CONST(opcode));
+    assert(loads_const(opcode));
     if (opcode == LOAD_CONST) {
         constant = PyList_GET_ITEM(co_consts, oparg);
     }
@@ -1332,7 +1338,7 @@ fold_tuple_on_constants(PyObject *const_cache,
     assert(inst[n].i_oparg == n);
 
     for (int i = 0; i < n; i++) {
-        if (!OPCODE_HAS_CONST(inst[i].i_opcode)) {
+        if (!loads_const(inst[i].i_opcode)) {
             return SUCCESS;
         }
     }
@@ -2102,7 +2108,7 @@ remove_unused_consts(basicblock *entryblock, PyObject *consts)
     for (basicblock *b = entryblock; b != NULL; b = b->b_next) {
         for (int i = 0; i < b->b_iused; i++) {
             int opcode = b->b_instr[i].i_opcode;
-            if (OPCODE_HAS_CONST(opcode) && opcode != LOAD_SMALL_INT) {
+            if (OPCODE_HAS_CONST(opcode)) {
                 int index = b->b_instr[i].i_oparg;
                 index_map[index] = index;
             }
@@ -2156,7 +2162,7 @@ remove_unused_consts(basicblock *entryblock, PyObject *consts)
     for (basicblock *b = entryblock; b != NULL; b = b->b_next) {
         for (int i = 0; i < b->b_iused; i++) {
             int opcode = b->b_instr[i].i_opcode;
-            if (OPCODE_HAS_CONST(opcode) && opcode != LOAD_SMALL_INT) {
+            if (OPCODE_HAS_CONST(opcode)) {
                 int index = b->b_instr[i].i_oparg;
                 assert(reverse_index_map[index] >= 0);
                 assert(reverse_index_map[index] < n_used_consts);