From: Victor Stinner <vstinner@python.org>
Date: Fri, 6 Mar 2020 14:55:14 +0000 (+0100)
Subject: bpo-39873: PyObject_Init() uses PyObject_INIT() (GH-18804)
X-Git-Tag: v3.9.0a5~164
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1fb5a9f394a6fdf62e21b96080c3257c959cf8c9;p=thirdparty%2FPython%2Fcpython.git

bpo-39873: PyObject_Init() uses PyObject_INIT() (GH-18804)

Avoid duplicated code:

* PyObject_Init() uses PyObject_INIT()
* PyObject_InitVar() uses PyObject_INIT_VAR()
---

diff --git a/Objects/object.c b/Objects/object.c
index 9c74e07eddcb..707424c98fe7 100644
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -144,12 +144,7 @@ PyObject_Init(PyObject *op, PyTypeObject *tp)
         return PyErr_NoMemory();
     }
 
-    Py_SET_TYPE(op, tp);
-    if (PyType_GetFlags(tp) & Py_TPFLAGS_HEAPTYPE) {
-        Py_INCREF(tp);
-    }
-    _Py_NewReference(op);
-    return op;
+    return PyObject_INIT(op, tp);
 }
 
 PyVarObject *
@@ -160,9 +155,7 @@ PyObject_InitVar(PyVarObject *op, PyTypeObject *tp, Py_ssize_t size)
         return (PyVarObject *) PyErr_NoMemory();
     }
 
-    Py_SET_SIZE(op, size);
-    PyObject_Init((PyObject *)op, tp);
-    return op;
+    return PyObject_INIT_VAR(op, tp, size);
 }
 
 PyObject *