Fix ups from code reviews

Author: DinoV

Include/internal/pycore_dict.h

@@ -36,7 +36,7 @@ extern int _PyDict_DelItem_KnownHash_LockHeld(PyObject *mp, PyObject *key,
 
 extern int _PyDict_Contains_KnownHash(PyObject *, PyObject *, Py_hash_t);
 
-extern void _PyDict_ClearKeysVersion(PyObject *mp);
+extern void _PyDict_ClearKeysVersionLockHeld(PyObject *mp);
 
 extern int _PyDict_Next(
     PyObject *mp, Py_ssize_t *pos, PyObject **key, PyObject **value, Py_hash_t *hash);

Include/internal/pycore_magic_number.h

@@ -290,7 +290,7 @@ Known values:
     Python 3.15a4 3657 (Add BINARY_OP_SUBSCR_USTR_INT)
     Python 3.15a4 3658 (Optimize bytecode for list/set called on genexp)
     Python 3.15a4 3659 (Add CALL_FUNCTION_EX specialization)
-    Python 3.15a4 3658 (Lazy imports IMPORT_NAME opcode changes)
+    Python 3.15a4 3660 (Lazy imports IMPORT_NAME opcode changes)
 
 
     Python 3.16 will start with 3700

Objects/dictobject.c

@@ -4678,7 +4678,7 @@ _PyDict_SizeOf_LockHeld(PyDictObject *mp)
 }
 
 void
-_PyDict_ClearKeysVersion(PyObject *mp)
+_PyDict_ClearKeysVersionLockHeld(PyObject *mp)
 {
     ASSERT_DICT_LOCKED(mp);
 

Objects/lazyimportobject.c

@@ -109,24 +109,6 @@ lazy_import_repr(PyObject *op)
     return res;
 }
 
-static PyObject *
-lazy_import_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
-{
-    if (!_PyArg_NoKeywords("lazy_import", kwds)) {
-        return NULL;
-    }
-
-    Py_ssize_t nargs = PyTuple_GET_SIZE(args);
-    if (!_PyArg_CheckPositional("lazy_import", nargs, 2, 3)) {
-        return NULL;
-    }
-
-    PyObject *builtins = PyTuple_GET_ITEM(args, 0);
-    PyObject *name = PyTuple_GET_ITEM(args, 1);
-    PyObject *fromlist = nargs == 3 ? PyTuple_GET_ITEM(args, 2) : NULL;
-    return _PyLazyImport_New(builtins, name, fromlist);
-}
-
 PyObject *
 _PyLazyImport_GetName(PyObject *op)
 {
@@ -172,6 +154,5 @@ PyTypeObject PyLazyImport_Type = {
     .tp_clear = lazy_import_clear,
     .tp_methods = lazy_import_methods,
     .tp_alloc = PyType_GenericAlloc,
-    .tp_new = lazy_import_new,
     .tp_free = PyObject_GC_Del,
 };

Objects/moduleobject.c

@@ -1269,14 +1269,14 @@ _PyModule_IsPossiblyShadowing(PyObject *origin)
 int
 _PyModule_ReplaceLazyValue(PyObject *dict, PyObject *name, PyObject *value)
 {
-    // The adaptive interpreter uses the dictionary version to return the
+    // The adaptive interpreter uses the dictionary keys version to return the
     // slot at a given index from the module. When replacing a value the
     // version number doesn't change, so we need to atomically clear the
     // version before replacing so that it doesn't return a lazy value.
     int err;
     Py_BEGIN_CRITICAL_SECTION(dict);
 
-    _PyDict_ClearKeysVersion(dict);
+    _PyDict_ClearKeysVersionLockHeld(dict);
     err = _PyDict_SetItem_LockHeld((PyDictObject *)dict, name, value);
 
     Py_END_CRITICAL_SECTION();

Python/bytecodes.c

@@ -1865,19 +1865,6 @@ dummy_func(
             _PyEval_LoadGlobalStackRef(GLOBALS(), BUILTINS(), name, res);
 
             ERROR_IF(PyStackRef_IsNull(*res));
-
-            PyObject *res_o = PyStackRef_AsPyObjectBorrow(*res);
-            if (PyLazyImport_CheckExact(res_o)) {
-                PyObject *l_v = _PyImport_LoadLazyImportTstate(tstate, res_o);
-                PyStackRef_CLOSE(res[0]);
-                ERROR_IF(l_v == NULL);
-                int err = _PyModule_ReplaceLazyValue(GLOBALS(), name, l_v);
-                if (err < 0) {
-                    Py_DECREF(l_v);
-                    ERROR_IF(true);
-                }
-                *res = PyStackRef_FromPyObjectSteal(l_v);
-            }
         }
 
         op(_PUSH_NULL_CONDITIONAL, ( -- null[oparg & 1])) {

Python/ceval.c

@@ -4176,6 +4176,24 @@ _PyEval_LoadGlobalStackRef(PyObject *globals, PyObject *builtins, PyObject *name
         }
         *writeto = PyStackRef_FromPyObjectSteal(res);
     }
+
+    PyObject *res_o = PyStackRef_AsPyObjectBorrow(*writeto);
+    if (PyLazyImport_CheckExact(res_o)) {
+        PyObject *l_v = _PyImport_LoadLazyImportTstate(PyThreadState_GET(), res_o);
+        PyStackRef_CLOSE(writeto[0]);
+        if (l_v == NULL) {
+            assert(PyErr_Occurred());
+            *writeto = PyStackRef_NULL;
+            return;
+        }
+        int err = _PyModule_ReplaceLazyValue(globals, name, l_v);
+        if (err < 0) {
+            Py_DECREF(l_v);
+            *writeto = PyStackRef_NULL;
+            return;
+        }
+        *writeto = PyStackRef_FromPyObjectSteal(l_v);
+    }
 }
 
 PyObject *

Python/executor_cases.c.h

@@ -11,7 +11,6 @@
 #include "pycore_floatobject.h"
 #include "pycore_frame.h"
 #include "pycore_function.h"
-#include "pycore_import.h"
 #include "pycore_interpframe.h"
 #include "pycore_interpolation.h"
 #include "pycore_intrinsics.h"