From 362e0ac6117d47308e9daaac24b8e5d93dc6ebf6 Mon Sep 17 00:00:00 2001
From: Ben Hsing <blhsing@gmail.com>
Date: Thu, 11 Jul 2024 13:41:10 +0800
Subject: [PATCH] fixed headers

---
 .../internal/pycore_global_objects_fini_generated.h  |  1 +
 Include/internal/pycore_global_strings.h             |  1 +
 Include/internal/pycore_runtime_init_generated.h     |  1 +
 Include/internal/pycore_unicodeobject_generated.h    |  4 ++++
 Objects/moduleobject.c                               | 12 ++++++------
 Python/pythonrun.c                                   |  2 +-
 6 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/Include/internal/pycore_global_objects_fini_generated.h b/Include/internal/pycore_global_objects_fini_generated.h
index 49fae83434da4d..c0840f9eb7eca2 100644
--- a/Include/internal/pycore_global_objects_fini_generated.h
+++ b/Include/internal/pycore_global_objects_fini_generated.h
@@ -662,6 +662,7 @@ _PyStaticObjects_CheckRefcnt(PyInterpreterState *interp) {
     _PyStaticObject_CheckRefcnt((PyObject *)&_Py_ID(__len__));
     _PyStaticObject_CheckRefcnt((PyObject *)&_Py_ID(__length_hint__));
     _PyStaticObject_CheckRefcnt((PyObject *)&_Py_ID(__lltrace__));
+    _PyStaticObject_CheckRefcnt((PyObject *)&_Py_ID(__loader__));
     _PyStaticObject_CheckRefcnt((PyObject *)&_Py_ID(__lshift__));
     _PyStaticObject_CheckRefcnt((PyObject *)&_Py_ID(__lt__));
     _PyStaticObject_CheckRefcnt((PyObject *)&_Py_ID(__main__));
diff --git a/Include/internal/pycore_global_strings.h b/Include/internal/pycore_global_strings.h
index d44a6b00e89642..51735a8a726e11 100644
--- a/Include/internal/pycore_global_strings.h
+++ b/Include/internal/pycore_global_strings.h
@@ -151,6 +151,7 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(__len__)
         STRUCT_FOR_ID(__length_hint__)
         STRUCT_FOR_ID(__lltrace__)
+        STRUCT_FOR_ID(__loader__)
         STRUCT_FOR_ID(__lshift__)
         STRUCT_FOR_ID(__lt__)
         STRUCT_FOR_ID(__main__)
diff --git a/Include/internal/pycore_runtime_init_generated.h b/Include/internal/pycore_runtime_init_generated.h
index 0ed61a2b1e3353..c5be67c6d80b9d 100644
--- a/Include/internal/pycore_runtime_init_generated.h
+++ b/Include/internal/pycore_runtime_init_generated.h
@@ -660,6 +660,7 @@ extern "C" {
     INIT_ID(__len__), \
     INIT_ID(__length_hint__), \
     INIT_ID(__lltrace__), \
+    INIT_ID(__loader__), \
     INIT_ID(__lshift__), \
     INIT_ID(__lt__), \
     INIT_ID(__main__), \
diff --git a/Include/internal/pycore_unicodeobject_generated.h b/Include/internal/pycore_unicodeobject_generated.h
index 7dad8d4fd7bab5..0e0ad6518771e9 100644
--- a/Include/internal/pycore_unicodeobject_generated.h
+++ b/Include/internal/pycore_unicodeobject_generated.h
@@ -404,6 +404,10 @@ _PyUnicode_InitStaticStrings(PyInterpreterState *interp) {
     _PyUnicode_InternStatic(interp, &string);
     assert(_PyUnicode_CheckConsistency(string, 1));
     assert(PyUnicode_GET_LENGTH(string) != 1);
+    string = &_Py_ID(__loader__);
+    _PyUnicode_InternStatic(interp, &string);
+    assert(_PyUnicode_CheckConsistency(string, 1));
+    assert(PyUnicode_GET_LENGTH(string) != 1);
     string = &_Py_ID(__lshift__);
     _PyUnicode_InternStatic(interp, &string);
     assert(_PyUnicode_CheckConsistency(string, 1));
diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c
index 778c2cdbd87ce0..a5dd09d0b6df31 100644
--- a/Objects/moduleobject.c
+++ b/Objects/moduleobject.c
@@ -65,16 +65,16 @@ module_init_dict(PyModuleObject *mod, PyObject *md_dict,
     int r;
 
 #define _Py_MODULE_INIT_SETATTR(name, value) \
-    _Py_DICT_OR_MAPPING_SETITEM(md_dict, &_Py_ID(name), value, r) \
+    _Py_DICT_OR_MAPPING_SETITEM(md_dict, name, value, r) \
     if (r != 0) { \
         return -1; \
     }
 
-    _Py_MODULE_INIT_SETATTR(__name__, name)
-    _Py_MODULE_INIT_SETATTR(__doc__, doc)
-    _Py_MODULE_INIT_SETATTR(__package__, Py_None)
-    _Py_MODULE_INIT_SETATTR(__loader__, Py_None)
-    _Py_MODULE_INIT_SETATTR(__spec__, Py_None)
+    _Py_MODULE_INIT_SETATTR(&_Py_ID(__name__), name)
+    _Py_MODULE_INIT_SETATTR(&_Py_ID(__doc__), doc)
+    _Py_MODULE_INIT_SETATTR(&_Py_ID(__package__), Py_None)
+    _Py_MODULE_INIT_SETATTR(&_Py_ID(__loader__), Py_None)
+    _Py_MODULE_INIT_SETATTR(&_Py_ID(__spec__), Py_None)
     if (PyUnicode_CheckExact(name)) {
         Py_XSETREF(mod->md_name, Py_NewRef(name));
     }
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 4aba4ef27e3a68..ed8e4b86630c1c 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -387,7 +387,7 @@ set_main_loader(PyObject *d, PyObject *filename, const char *loader_name)
         return -1;
     }
 
-    if (PyDict_SetItemString(d, "__loader__", loader) < 0) {
+    if (PyDict_SetItem(d, &_Py_ID(__loader__), loader) < 0) {
         Py_DECREF(loader);
         return -1;
     }