Rebase on Phase3

Author: TobiasWrigstad

Include/cpython/object.h

@@ -393,7 +393,7 @@ PyAPI_FUNC(PyObject *) _PyObject_FunctionStr(PyObject *);
         _Py_TYPEOF(dst)* _tmp_dst_ptr = &(dst); \
         _Py_TYPEOF(dst) _tmp_old_dst = (*_tmp_dst_ptr); \
         *_tmp_dst_ptr = (src); \
-        if (_tmp_old_dst) _Pyrona_RemoveReference(obj, _tmp_old_dst); \
+        if (_tmp_old_dst) _Py_RegionRemoveReference(obj, _tmp_old_dst); \
         Py_XDECREF(_tmp_old_dst); \
     } while (0)
 #else
@@ -403,7 +403,7 @@ PyAPI_FUNC(PyObject *) _PyObject_FunctionStr(PyObject *);
         PyObject *_tmp_old_dst = (*_tmp_dst_ptr); \
         PyObject *_tmp_src = _PyObject_CAST(src); \
         memcpy(_tmp_dst_ptr, &_tmp_src, sizeof(PyObject*)); \
-        if (_tmp_old_dst) _Pyrona_RemoveReference(obj, _tmp_old_dst); \
+        if (_tmp_old_dst) _Py_RegionRemoveReference(obj, _tmp_old_dst); \
         Py_XDECREF(_tmp_old_dst); \
     } while (0)
 #endif

Objects/object.c

@@ -1688,7 +1688,7 @@ PyObject_GenericSetDict(PyObject *obj, PyObject *value, void *context)
                      "not a '%.200s'", Py_TYPE(value)->tp_name);
         return -1;
     }
-    if (_Pyrona_AddReference(obj, value)) {
+    if (_Py_RegionAddReference(obj, value)) {
         Py_XSETREF(*dictptr, Py_NewRef(value));
         return 0;
     } else {

Objects/typeobject.c

@@ -2942,7 +2942,7 @@ subtype_setdict(PyObject *obj, PyObject *value, void *context)
                      "not a '%.200s'", Py_TYPE(value)->tp_name);
         return -1;
     }
-    if (value == NULL || _Pyrona_AddReference(obj, value)) {
+    if (value == NULL || _Py_RegionAddReference(obj, value)) {
         Py_XSETREF_WITH_REGION(*dictptr, Py_XNewRef(value), obj);
         return 0;
     } else {