fixup: revert any/all static-ification

Author: NekoAsakura

Modules/_testinternalcapi/test_cases.c.h

@@ -1884,8 +1884,9 @@ dummy_func(
         }
 
         inst(LOAD_COMMON_CONSTANT, ( -- value)) {
+            // Keep in sync with _common_constants in opcode.py
             assert(oparg < NUM_COMMON_CONSTANTS);
-            value = load_common_constant(tstate->interp, oparg);
+            value = PyStackRef_FromPyObjectNew(tstate->interp->common_consts[oparg]);
         }
 
         inst(LOAD_BUILD_CLASS, ( -- bc)) {

Python/bytecodes.c

@@ -628,11 +628,3 @@ gen_try_set_executing(PyGenObject *gen)
             (PyLongObject *)PyStackRef_AsPyObjectBorrow(left),           \
             (PyLongObject *)PyStackRef_AsPyObjectBorrow(right));         \
     }
-
-static inline _PyStackRef
-load_common_constant(PyInterpreterState *interp, unsigned int oparg)
-{
-    assert(oparg < NUM_COMMON_CONSTANTS);
-    assert(_Py_IsImmortal(interp->common_consts[oparg]));
-    return PyStackRef_FromPyObjectBorrow(interp->common_consts[oparg]);
-}

Python/ceval_macros.h

@@ -1330,7 +1330,7 @@ get_const_value(int opcode, int oparg, PyObject *co_consts)
     }
     if (opcode == LOAD_COMMON_CONSTANT) {
         assert(oparg < NUM_COMMON_CONSTANTS);
-        return _PyInterpreterState_GET()->common_consts[oparg];
+        return Py_NewRef(_PyInterpreterState_GET()->common_consts[oparg]);
     }
 
     if (constant == NULL) {

Python/executor_cases.c.h

@@ -877,9 +877,14 @@ dummy_func(void) {
     op(_LOAD_COMMON_CONSTANT, (-- value)) {
         assert(oparg < NUM_COMMON_CONSTANTS);
         PyObject *val = _PyInterpreterState_GET()->common_consts[oparg];
-        assert(_Py_IsImmortal(val));
-        ADD_OP(_LOAD_CONST_INLINE_BORROW, 0, (uintptr_t)val);
-        value = PyJitRef_Borrow(sym_new_const(ctx, val));
+        if (_Py_IsImmortal(val)) {
+            ADD_OP(_LOAD_CONST_INLINE_BORROW, 0, (uintptr_t)val);
+            value = PyJitRef_Borrow(sym_new_const(ctx, val));
+        }
+        else {
+            ADD_OP(_LOAD_CONST_INLINE, 0, (uintptr_t)val);
+            value = sym_new_const(ctx, val);
+        }
     }
 
     op(_LOAD_SMALL_INT, (-- value)) {

Python/flowgraph.c

@@ -646,7 +646,6 @@ def has_error_without_pop(op: parser.CodeDef) -> bool:
     "_PyFunction_SetVersion",
     "_PyGen_GetGeneratorFromFrame",
     "gen_try_set_executing",
-    "load_common_constant",
     "_PyInterpreterState_GET",
     "_PyList_AppendTakeRef",
     "_PyList_ITEMS",