Use Py_mod_constants instead of PyModuleDef.m_constants

python · tiran · Nov 14, 2020 · Nov 15, 2020 · Nov 15, 2020 · Nov 16, 2020
commit 22e4f7f12d5f186a9be4b5444963ebff7b583295
@@ -66,8 +66,12 @@ typedef struct PyModuleDef_Slot{
 #define Py_mod_create 1
 #define Py_mod_exec 2
 
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03100000
+#define Py_mod_constants 3
+#endif
+
 #ifndef Py_LIMITED_API
-#define _Py_mod_LAST_SLOT 2
+#define _Py_mod_LAST_SLOT 3
 #endif
 
 #endif /* New in 3.5 */
@@ -125,7 +129,6 @@ typedef struct PyModuleDef{
   traverseproc m_traverse;
   inquiry m_clear;
   freefunc m_free;
-  struct PyModuleConst_Def* m_constants;
 } PyModuleDef;
 
 

diff --git a/Modules/mathmodule.c b/Modules/mathmodule.c
@@ -3599,13 +3599,18 @@ PyDoc_STRVAR(module_doc,
 "This module provides access to the mathematical functions\n"
 "defined by the C standard.");
 
+static PyModuleDef_Slot math_slots[] = {
+    {Py_mod_constants, math_constants},
+    {0, NULL}
+};
+
 static struct PyModuleDef mathmodule = {
     PyModuleDef_HEAD_INIT,
     .m_name = "math",
     .m_doc = module_doc,
     .m_size = 0,
     .m_methods = math_methods,
-    .m_constants = math_constants,
+    .m_slots = math_slots,
 };
 
 PyMODINIT_FUNC

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
@@ -15772,6 +15772,7 @@ static PyModuleConst_Def _posix_constants[] = {
 
 static PyModuleDef_Slot posixmodile_slots[] = {
     {Py_mod_exec, posixmodule_exec},
+    {Py_mod_constants, _posix_constants},
     {0, NULL}
 };
 
@@ -15785,7 +15786,6 @@ static struct PyModuleDef posixmodule = {
     .m_traverse = _posix_traverse,
     .m_clear = _posix_clear,
     .m_free = _posix_free,
-    .m_constants = _posix_constants,
 };
 
 PyMODINIT_FUNC

@@ -299,12 +299,6 @@ _PyModule_CreateInitialized(struct PyModuleDef* module, int module_api_version)
             return NULL;
         }
     }
-    if (module->m_constants != NULL) {
-        if (PyModule_AddConstants((PyObject *) m, module->m_constants) != 0) {
-            Py_DECREF(m);
-            return NULL;
-        }
-    }
     m->md_def = module;
     return (PyObject*)m;
 }
@@ -424,13 +418,6 @@ PyModule_FromDefAndSpec2(struct PyModuleDef* def, PyObject *spec, int module_api
         }
     }
 
-    if (def->m_constants != NULL) {
-        if (PyModule_AddConstants(m, def->m_constants) != 0) {
-            Py_DECREF(m);
-            return NULL;
-        }
-    }
-
     Py_DECREF(nameobj);
     return m;
 
@@ -494,6 +481,12 @@ PyModule_ExecDef(PyObject *module, PyModuleDef *def)
                     return -1;
                 }
                 break;
+            case Py_mod_constants:
+                ret = PyModule_AddConstants(module, (PyModuleConst_Def *)cur_slot->value);
+                if (ret == -1) {
+                    return -1;
+                }
+                break;
             default:
                 PyErr_Format(
                     PyExc_SystemError,