fixups

Fidget-Spinner · Mar 23, 2024 · Mar 23, 2024 · Mar 23, 2024 · Mar 23, 2024 · Mar 26, 2024
commit 25bf135097fea350fe29f630fc1e3634aa1245b1
diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h
@@ -275,7 +275,7 @@ extern void _Py_Specialize_StoreSubscr(PyObject *container, PyObject *sub,
 extern void _Py_Specialize_Call(PyObject *callable, _Py_CODEUNIT *instr,
                                 int nargs);
 extern void _Py_Specialize_BinaryOp(PyObject *lhs, PyObject *rhs, _Py_CODEUNIT *instr,
-                                    int oparg, PyObject **locals);
+                                    int oparg, _Py_TaggedObject *locals);
 extern void _Py_Specialize_CompareOp(PyObject *lhs, PyObject *rhs,
                                      _Py_CODEUNIT *instr, int oparg);
 extern void _Py_Specialize_UnpackSequence(PyObject *seq, _Py_CODEUNIT *instr,

diff --git a/Include/internal/pycore_frame.h b/Include/internal/pycore_frame.h
@@ -54,20 +54,6 @@ enum _frameowner {
     FRAME_OWNED_BY_CSTACK = 3,
 };
 
-typedef struct {
-    PyObject *obj;
-    uintptr_t bits;
-} _Py_TaggedObject;
-
-#define Py_OBJECT_TAG (0b0)
-
-#ifdef Py_GIL_DISABLED
-#define Py_CLEAR_TAG(tagged) ((PyObject *)(tagged.bits & ~(Py_OBJECT_TAG)))
-#else
-#define Py_CLEAR_TAG(tagged) ((tagged).obj)
-#endif
-
-#define Py_OBJ_PACK(obj) ((_Py_TaggedObject){.bits = (uintptr_t)(obj)})
 
 typedef struct _PyInterpreterFrame {
     PyObject *f_executable; /* Strong reference (code object or None) */
@@ -94,7 +80,7 @@ static inline PyCodeObject *_PyFrame_GetCode(_PyInterpreterFrame *f) {
 }
 
 static inline _Py_TaggedObject *_PyFrame_Stackbase(_PyInterpreterFrame *f) {
-    return (_Py_TaggedObject *)(f->localsplus + _PyFrame_GetCode(f)->co_nlocalsplus);
+    return (f->localsplus + _PyFrame_GetCode(f)->co_nlocalsplus);
 }
 
 static inline _Py_TaggedObject _PyFrame_StackPeek(_PyInterpreterFrame *f) {

diff --git a/Include/internal/pycore_list.h b/Include/internal/pycore_list.h
@@ -9,6 +9,7 @@ extern "C" {
 #endif
 
 #include "pycore_freelist.h"  // _PyFreeListState
+#include "pycore_frame.h"     // _Py_TaggedObject
 
 PyAPI_FUNC(PyObject*) _PyList_Extend(PyListObject *, PyObject *);
 extern void _PyList_DebugMallocStats(FILE *out);

diff --git a/Include/object.h b/Include/object.h
@@ -228,6 +228,21 @@ struct _object {
 /* Cast argument to PyObject* type. */
 #define _PyObject_CAST(op) _Py_CAST(PyObject*, (op))
 
+typedef union {
+    PyObject *obj;
+    uintptr_t bits;
+} _Py_TaggedObject;
+
+#define Py_OBJECT_TAG (0b0)
+
+#ifdef Py_GIL_DISABLED
+#define Py_CLEAR_TAG(tagged) ((PyObject *)((tagged).bits & ~(Py_OBJECT_TAG)))
+#else
+#define Py_CLEAR_TAG(tagged) ((PyObject *)(uintptr_t)((tagged).bits))
+#endif
+
+#define Py_OBJ_PACK(obj) ((_Py_TaggedObject){.bits = (uintptr_t)(obj)})
+
 typedef struct {
     PyObject ob_base;
     Py_ssize_t ob_size; /* Number of items in variable part */

@@ -524,7 +524,9 @@ dummy_func(
              */
             assert(Py_REFCNT(left) >= 2);
             _Py_DECREF_NO_DEALLOC(left);
-            PyUnicode_Append(target_local, right);
+            PyObject *temp = Py_CLEAR_TAG(*target_local);
+            PyUnicode_Append(&temp, right);
+            *target_local = Py_OBJ_PACK(temp);
             _Py_DECREF_SPECIALIZED(right, _PyUnicode_ExactDealloc);
             ERROR_IF(Py_CLEAR_TAG(*target_local) == NULL, error);
             // The STORE_FAST is already done.

@@ -247,7 +247,7 @@ static int check_args_iterable(PyThreadState *, PyObject *func, PyObject *vararg
 static int get_exception_handler(PyCodeObject *, int, int*, int*, int*);
 static _PyInterpreterFrame *
 _PyEvalFramePushAndInit(PyThreadState *tstate, PyFunctionObject *func,
-                        PyObject *locals, PyObject* const* args,
+                        PyObject *locals, _Py_TaggedObject const* args,
                         size_t argcount, PyObject *kwnames);
 static  _PyInterpreterFrame *
 _PyEvalFramePushAndInit_Ex(PyThreadState *tstate, PyFunctionObject *func,
@@ -1724,7 +1724,7 @@ _PyEval_FrameClearAndPop(PyThreadState *tstate, _PyInterpreterFrame * frame)
 /* Consumes references to func, locals and all the args */
 static _PyInterpreterFrame *
 _PyEvalFramePushAndInit(PyThreadState *tstate, PyFunctionObject *func,
-                        PyObject *locals, PyObject* const* args,
+                        PyObject *locals, _Py_TaggedObject const* args,
                         size_t argcount, PyObject *kwnames)
 {
     PyCodeObject * code = (PyCodeObject *)func->func_code;
@@ -1743,12 +1743,12 @@ _PyEvalFramePushAndInit(PyThreadState *tstate, PyFunctionObject *func,
 fail:
     /* Consume the references */
     for (size_t i = 0; i < argcount; i++) {
-        Py_DECREF(args[i]);
+        Py_DECREF(Py_CLEAR_TAG(args[i]));
     }
     if (kwnames) {
         Py_ssize_t kwcount = PyTuple_GET_SIZE(kwnames);
         for (Py_ssize_t i = 0; i < kwcount; i++) {
-            Py_DECREF(args[i+argcount]);
+            Py_DECREF(Py_CLEAR_TAG(args[i+argcount]));
         }
     }
     PyErr_NoMemory();

diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
diff --git a/Python/specialize.c b/Python/specialize.c
@@ -2137,7 +2137,7 @@ binary_op_fail_kind(int oparg, PyObject *lhs, PyObject *rhs)
 
 void
 _Py_Specialize_BinaryOp(PyObject *lhs, PyObject *rhs, _Py_CODEUNIT *instr,
-                        int oparg, PyObject **locals)
+                        int oparg, _Py_TaggedObject *locals)
 {
     assert(ENABLE_SPECIALIZATION);
     assert(_PyOpcode_Caches[BINARY_OP] == INLINE_CACHE_ENTRIES_BINARY_OP);
@@ -2151,7 +2151,7 @@ _Py_Specialize_BinaryOp(PyObject *lhs, PyObject *rhs, _Py_CODEUNIT *instr,
             if (PyUnicode_CheckExact(lhs)) {
                 _Py_CODEUNIT next = instr[INLINE_CACHE_ENTRIES_BINARY_OP + 1];
                 bool to_store = (next.op.code == STORE_FAST);
-                if (to_store && locals[next.op.arg] == lhs) {
+                if (to_store && Py_CLEAR_TAG(locals[next.op.arg]) == lhs) {
                     instr->op.code = BINARY_OP_INPLACE_ADD_UNICODE;
                     goto success;
                 }