rename to POP_TOP_OPARG

Author: Fidget-Spinner

Include/internal/pycore_opcode_metadata.h

@@ -387,7 +387,7 @@ dummy_func(
         }
 
         // This is expanded to POP_TOP + POP_TOP + POP_TOP + ... (oparg times) in the JIT trace.
-        op(_POP_TOS_OPARG, (args[oparg] -- )) {
+        op(_POP_TOP_OPARG, (args[oparg] -- )) {
             _PyStackRef_CloseStack(args, oparg);
             DEAD(args);
         }
@@ -4670,7 +4670,7 @@ dummy_func(
             unused/2 +
             _GUARD_CALLABLE_BUILTIN_FAST +
             _CALL_BUILTIN_FAST +
-            _POP_TOS_OPARG +
+            _POP_TOP_OPARG +
             POP_TOP +
             POP_TOP +
             _ERROR_IF_TOS_NULL +

Include/internal/pycore_uop_ids.h

@@ -945,7 +945,7 @@ _PyJit_translate_single_bytecode_to_trace(
                     assert(next->op.code == STORE_FAST);
                     operand = next->op.arg;
                 }
-                else if (uop == _POP_TOS_OPARG) {
+                else if (uop == _POP_TOP_OPARG) {
                     for (int i = 0; i < oparg; i++) {
                         ADD_TO_TRACE(_POP_TOP, 0, operand, target);
                     }

Include/internal/pycore_uop_metadata.h

@@ -778,8 +778,8 @@ dummy_func(void) {
         a = arg;
     }
 
-    // This is expanded into _POP_NOS in the trace recorder/translator.
-    op(_POP_TOS_OPARG, (args[oparg] --)) {
+    // This is expanded into POP_TOP, POP_TOP, POP_TOP, POP_TOP (...oparg times) in the trace recorder/translator.
+    op(_POP_TOP_OPARG, (args[oparg] --)) {
         (void)args;
         Py_FatalError("Forbidden uop seeen in trace.\n");
     }