Address review

Author: Fidget-Spinner

Include/internal/pycore_opcode_metadata.h

@@ -48,8 +48,9 @@ typedef struct {
  *    uint16_t error_target;
  */
 typedef struct {
-    uint16_t opcode:15;
+    uint16_t opcode:14;
     uint16_t format:1;
+    uint16_t is_virtual:1;   // Used for tier2 optimization.
     uint16_t oparg;
     union {
         uint32_t target;
@@ -59,7 +60,6 @@ typedef struct {
         };
     };
     uint64_t operand;  // A cache entry
-    char is_virtual;   // Used for tier2 optimization.
 } _PyUOpInstruction;
 
 typedef struct {

Include/internal/pycore_optimizer.h

@@ -193,7 +193,7 @@ PyStackRef_FromPyObjectImmortal(PyObject *obj)
 #   define PyStackRef_CLOSE(REF)                                        \
         do {                                                            \
             _PyStackRef _close_tmp = (REF);                             \
-            if (!PyStackRef_IsDeferred(_close_tmp)) {                   \
+            if (!i(_close_tmp)) {                   \
                 Py_DECREF(PyStackRef_AsPyObjectBorrow(_close_tmp));     \
             }                                                           \
         } while (0)

Include/internal/pycore_stackref.h

@@ -140,7 +140,7 @@ dummy_func(
     switch (opcode) {
 
 // BEGIN BYTECODES //
-        _static inst(NOP, (--)) {
+        pure inst(NOP, (--)) {
         }
 
         family(RESUME, 0) = {
@@ -239,7 +239,7 @@ dummy_func(
             value = PyStackRef_DUP(value_s);
         }
 
-        replicate(8) _static inst(LOAD_FAST, (-- value)) {
+        replicate(8) pure inst(LOAD_FAST, (-- value)) {
             assert(!PyStackRef_IsNull(GETLOCAL(oparg)));
             value = PyStackRef_DUP(GETLOCAL(oparg));
         }
@@ -261,7 +261,7 @@ dummy_func(
             value = PyStackRef_FromPyObjectNew(GETITEM(FRAME_CO_CONSTS, oparg));
         }
 
-        replicate(8) _static inst(STORE_FAST, (value --)) {
+        replicate(8) pure inst(STORE_FAST, (value --)) {
             SETLOCAL(oparg, value);
         }
 
@@ -283,7 +283,7 @@ dummy_func(
             SETLOCAL(oparg2, value2);
         }
 
-        _static inst(POP_TOP, (value --)) {
+        pure inst(POP_TOP, (value --)) {
             DECREF_INPUTS();
         }
 
@@ -4749,11 +4749,11 @@ dummy_func(
             DEOPT_IF(!current_executor->vm_data.valid);
         }
 
-        tier2 _static op(_LOAD_CONST_INLINE, (ptr/4 -- value)) {
+        tier2 pure op(_LOAD_CONST_INLINE, (ptr/4 -- value)) {
             value = PyStackRef_FromPyObjectNew(ptr);
         }
 
-        tier2 _static op(_LOAD_CONST_INLINE_BORROW, (ptr/4 -- value)) {
+        tier2 pure op(_LOAD_CONST_INLINE_BORROW, (ptr/4 -- value)) {
             value = PyStackRef_FromPyObjectImmortal(ptr);
         }
 

Include/internal/pycore_uop_metadata.h

@@ -216,24 +216,6 @@ partial_evaluate_uops(
         }
 #endif
 
-        int is_static = (_PyUop_Flags[opcode] & HAS_STATIC_FLAG);
-        if (!is_static) {
-            MATERIALIZE_INST();
-        }
-        if (!is_static &&
-            // During these two opcodes, there's an abstract frame on the stack.
-            // Which is not a valid symbol.
-            (opcode != _PUSH_FRAME && opcode != _SAVE_RETURN_OFFSET)) {
-            // An escaping opcode means we need to materialize _everything_.
-            if (_PyUop_Flags[opcode] & HAS_ESCAPES_FLAG) {
-                materialize_ctx(ctx);
-            }
-            else {
-
-                materialize_frame(ctx->frame);
-            }
-        }
-
         switch (opcode) {
 
 #include "partial_evaluator_cases.c.h"