Address review comments

Author: markshannon

Include/internal/pycore_opcode_metadata.h

@@ -684,7 +684,7 @@ translate_bytecode_to_trace(
                         // Add one to account for the actual opcode/oparg pair:
                         int offset = expansion->uops[i].offset + 1;
                         switch (expansion->uops[i].size) {
-                            case OPARG_FULL:
+                            case OPARG_SIMPLE:
                                 assert(opcode != JUMP_BACKWARD_NO_INTERRUPT && opcode != JUMP_BACKWARD);
                                 break;
                             case OPARG_CACHE_1:

Python/optimizer.c

@@ -492,6 +492,14 @@ dummy_func(void) {
         value = sym_new_const(ctx, ptr);
     }
 
+    op(_POP_TOP_LOAD_CONST_INLINE, (ptr/4, pop -- value)) {
+        value = sym_new_const(ctx, ptr);
+    }
+
+    op(_POP_TOP_LOAD_CONST_INLINE_BORROW, (ptr/4, pop -- value)) {
+        value = sym_new_const(ctx, ptr);
+    }
+
     op(_COPY, (bottom, unused[oparg-1] -- bottom, unused[oparg-1], top)) {
         assert(oparg > 0);
         top = bottom;
@@ -521,7 +529,6 @@ dummy_func(void) {
                 if (watched_mutations < _Py_MAX_ALLOWED_GLOBALS_MODIFICATIONS) {
                     PyDict_Watch(GLOBALS_WATCHER_ID, dict);
                     _Py_BloomFilter_Add(dependencies, dict);
-                    PyObject *dict = mod->md_dict;
                     PyObject *res = convert_global_to_const(this_instr, dict, true);
                     attr = sym_new_const(ctx, res);
                 }

Python/optimizer_bytecodes.c

@@ -417,11 +417,13 @@ def analyze_caches(inputs: list[parser.InputEffect]) -> list[CacheEntry]:
         i for i in inputs if isinstance(i, parser.CacheEffect)
     ]
     if caches:
-        for cache in (caches[0], caches[-1]):
+        # Middle entries are allowed to be unused. Check first and last caches.
+        for index in (0, -1):
+            cache = caches[index]
             if cache.name == "unused":
-                raise analysis_error(
-                    "First cache entry in op is unused. Move to enclosing macro.", cache.tokens[0]
-                )
+                position = "First" if index == 0 else "Last"
+                msg = f"{position} cache entry in op is unused. Move to enclosing macro."
+                raise analysis_error(msg, cache.tokens[0])
     return [CacheEntry(i.name, int(i.size)) for i in caches]
 
 

Python/optimizer_cases.c.h

@@ -26,7 +26,7 @@
 # Constants used instead of size for macro expansions.
 # Note: 1, 2, 4 must match actual cache entry sizes.
 OPARG_KINDS = {
-    "OPARG_FULL": 0,
+    "OPARG_SIMPLE": 0,
     "OPARG_CACHE_1": 1,
     "OPARG_CACHE_2": 2,
     "OPARG_CACHE_4": 4,
@@ -343,18 +343,20 @@ def generate_expansion_table(analysis: Analysis, out: CWriter) -> None:
             for part in inst.parts:
                 size = part.size
                 if isinstance(part, Uop):
-                    fmt = "0"
+                    # Skip specializations
+                    if "specializing" in part.annotations:
+                        continue
+                    # Add the primary expansion.
+                    fmt = "OPARG_SIMPLE"
                     if part.name == "_SAVE_RETURN_OFFSET":
                         fmt = "OPARG_SAVE_RETURN_OFFSET"
                     elif part.caches:
                         fmt = str(part.caches[0].size)
-                    # Skip specializations
-                    if "specializing" in part.annotations:
-                        continue
                     if "replaced" in part.annotations:
                         fmt = "OPARG_REPLACED"
                     expansions.append((part.name, fmt, offset))
                     if len(part.caches) > 1:
+                        # Add expansion for the second operand
                         internal_offset = 0
                         for cache in part.caches[:-1]:
                             internal_offset += cache.size