Revert "Preget tp_dict"

This reverts commit 1eed75d.

Author: sergey-miryanov

Objects/typeobject.c

@@ -4144,8 +4144,9 @@ type_new_set_name(const type_new_ctx *ctx, PyTypeObject *type)
 
 /* Set __module__ in the dict */
 static int
-type_new_set_module(PyObject *dict)
+type_new_set_module(PyTypeObject *type)
 {
+    PyObject *dict = lookup_tp_dict(type);
     int r = PyDict_Contains(dict, &_Py_ID(__module__));
     if (r < 0) {
         return -1;
@@ -4172,9 +4173,10 @@ type_new_set_module(PyObject *dict)
 /* Set ht_qualname to dict['__qualname__'] if available, else to
    __name__.  The __qualname__ accessor will look for ht_qualname. */
 static int
-type_new_set_ht_name(PyTypeObject *type, PyObject *dict)
+type_new_set_ht_name(PyTypeObject *type)
 {
     PyHeapTypeObject *et = (PyHeapTypeObject *)type;
+    PyObject *dict = lookup_tp_dict(type);
     PyObject *qualname;
     if (PyDict_GetItemRef(dict, &_Py_ID(__qualname__), &qualname) < 0) {
         return -1;
@@ -4203,8 +4205,9 @@ type_new_set_ht_name(PyTypeObject *type, PyObject *dict)
    and is a string.  The __doc__ accessor will first look for tp_doc;
    if that fails, it will still look into __dict__. */
 static int
-type_new_set_doc(PyTypeObject *type, PyObject* dict)
+type_new_set_doc(PyTypeObject *type)
 {
+    PyObject *dict = lookup_tp_dict(type);
     PyObject *doc = PyDict_GetItemWithError(dict, &_Py_ID(__doc__));
     if (doc == NULL) {
         if (PyErr_Occurred()) {
@@ -4238,8 +4241,9 @@ type_new_set_doc(PyTypeObject *type, PyObject* dict)
 
 
 static int
-type_new_staticmethod(PyObject *dict, PyObject *attr)
+type_new_staticmethod(PyTypeObject *type, PyObject *attr)
 {
+    PyObject *dict = lookup_tp_dict(type);
     PyObject *func = PyDict_GetItemWithError(dict, attr);
     if (func == NULL) {
         if (PyErr_Occurred()) {
@@ -4265,8 +4269,9 @@ type_new_staticmethod(PyObject *dict, PyObject *attr)
 
 
 static int
-type_new_classmethod(PyObject *dict, PyObject *attr)
+type_new_classmethod(PyTypeObject *type, PyObject *attr)
 {
+    PyObject *dict = lookup_tp_dict(type);
     PyObject *func = PyDict_GetItemWithError(dict, attr);
     if (func == NULL) {
         if (PyErr_Occurred()) {
@@ -4367,8 +4372,9 @@ type_new_set_slots(const type_new_ctx *ctx, PyTypeObject *type)
 
 /* store type in class' cell if one is supplied */
 static int
-type_new_set_classcell(PyTypeObject *type, PyObject *dict)
+type_new_set_classcell(PyTypeObject *type)
 {
+    PyObject *dict = lookup_tp_dict(type);
     PyObject *cell = PyDict_GetItemWithError(dict, &_Py_ID(__classcell__));
     if (cell == NULL) {
         if (PyErr_Occurred()) {
@@ -4393,8 +4399,9 @@ type_new_set_classcell(PyTypeObject *type, PyObject *dict)
 }
 
 static int
-type_new_set_classdictcell(PyObject *dict)
+type_new_set_classdictcell(PyTypeObject *type)
 {
+    PyObject *dict = lookup_tp_dict(type);
     PyObject *cell = PyDict_GetItemWithError(dict, &_Py_ID(__classdictcell__));
     if (cell == NULL) {
         if (PyErr_Occurred()) {
@@ -4425,33 +4432,30 @@ type_new_set_attrs(const type_new_ctx *ctx, PyTypeObject *type)
         return -1;
     }
 
-    PyObject *dict = lookup_tp_dict(type);
-    assert(dict);
-
-    if (type_new_set_module(dict) < 0) {
+    if (type_new_set_module(type) < 0) {
         return -1;
     }
 
-    if (type_new_set_ht_name(type, dict) < 0) {
+    if (type_new_set_ht_name(type) < 0) {
         return -1;
     }
 
-    if (type_new_set_doc(type, dict) < 0) {
+    if (type_new_set_doc(type) < 0) {
         return -1;
     }
 
     /* Special-case __new__: if it's a plain function,
        make it a static function */
-    if (type_new_staticmethod(dict, &_Py_ID(__new__)) < 0) {
+    if (type_new_staticmethod(type, &_Py_ID(__new__)) < 0) {
         return -1;
     }
 
     /* Special-case __init_subclass__ and __class_getitem__:
        if they are plain functions, make them classmethods */
-    if (type_new_classmethod(dict, &_Py_ID(__init_subclass__)) < 0) {
+    if (type_new_classmethod(type, &_Py_ID(__init_subclass__)) < 0) {
         return -1;
     }
-    if (type_new_classmethod(dict, &_Py_ID(__class_getitem__)) < 0) {
+    if (type_new_classmethod(type, &_Py_ID(__class_getitem__)) < 0) {
         return -1;
     }
 
@@ -4461,10 +4465,10 @@ type_new_set_attrs(const type_new_ctx *ctx, PyTypeObject *type)
 
     type_new_set_slots(ctx, type);
 
-    if (type_new_set_classcell(type, dict) < 0) {
+    if (type_new_set_classcell(type) < 0) {
         return -1;
     }
-    if (type_new_set_classdictcell(dict) < 0) {
+    if (type_new_set_classdictcell(type) < 0) {
         return -1;
     }
     return 0;