gh-152298: Preserve lazy import global bindings

Author: 1sgtpepper

Include/internal/pycore_import.h

@@ -39,10 +39,8 @@ extern PyObject * _PyImport_GetAbsName(
 // Symbol is exported for the JIT on Windows builds.
 PyAPI_FUNC(PyObject *) _PyImport_LoadLazyImportTstate(
     PyThreadState *tstate, PyObject *lazy_import);
-// Returns 1 with a new reference in result, 0 if not pending, or -1 on error.
-extern int _PyImport_TryLoadLazySubmodule(
-    PyObject *mod_name, PyObject *attr_name, PyObject *mod_dict,
-    PyObject **result);
+extern PyObject * _PyImport_TryLoadLazySubmodule(
+    PyObject *mod_name, PyObject *attr_name);
 extern PyObject * _PyImport_LazyImportModuleLevelObject(
     PyThreadState *tstate, PyObject *name, PyObject *builtins,
     PyObject *globals, PyObject *locals, PyObject *fromlist, int level);

Include/internal/pycore_lazyimportobject.h

@@ -19,19 +19,19 @@ typedef struct {
     PyObject *lz_builtins;
     PyObject *lz_from;
     PyObject *lz_attr;
+    // Protected by the lazy object lock.
     PyObject *lz_globals;
     PyObject *lz_key;
-    PyObject *lz_resolved;       // Protected by the lazy object lock.
-    Py_hash_t lz_key_hash;
+    PyObject *lz_resolved;
     // Frame information for the original import location.
     PyCodeObject *lz_code;     // Code object where the lazy import was created.
     int lz_instr_offset;       // Instruction offset where the lazy import was created.
 } PyLazyImportObject;
 
 
 PyAPI_FUNC(PyObject *) _PyLazyImport_GetName(PyObject *lazy_import);
-PyAPI_FUNC(PyObject *) _PyLazyImport_GetResolved(PyObject *lazy_import);
-PyAPI_FUNC(int) _PyLazyImport_FinishResolve(
+extern PyObject * _PyLazyImport_GetResolved(PyObject *lazy_import);
+extern int _PyLazyImport_FinishResolve(
     PyObject *lazy_import, PyObject *resolved);
 PyAPI_FUNC(int) _PyLazyImport_ReplaceDictItemIfCurrent(
     PyObject *lazy_import, PyObject *dict, PyObject *name,