Flow _PyInterpreterFrame into _PyLazyImport_New

Author: DinoV

Include/internal/pycore_ceval.h

@@ -316,7 +316,7 @@ PyAPI_FUNC(PyObject *) _PyEval_LazyImportName(
     PyObject *locals, PyObject *name, PyObject *fromlist, PyObject *level,
     int lazy);
 PyAPI_FUNC(PyObject *) _PyEval_LazyImportFrom(
-    PyThreadState *tstate, PyObject *v, PyObject *name);
+    PyThreadState *tstate, _PyInterpreterFrame *frame, PyObject *v, PyObject *name);
 PyAPI_FUNC(PyObject *) _PyEval_ImportName(
     PyThreadState *tstate, PyObject *builtins, PyObject *globals,
     PyObject *locals, PyObject *name, PyObject *fromlist, PyObject *level);

Include/internal/pycore_lazyimportobject.h

@@ -27,7 +27,7 @@ typedef struct {
 
 PyAPI_FUNC(PyObject *) _PyLazyImport_GetName(PyObject *lazy_import);
 PyAPI_FUNC(PyObject *) _PyLazyImport_New(
-    PyObject *import_func, PyObject *from, PyObject *attr);
+    struct _PyInterpreterFrame *frame, PyObject *import_func, PyObject *from, PyObject *attr);
 
 #ifdef __cplusplus
 }

Objects/lazyimportobject.c

@@ -11,7 +11,7 @@
 #define PyLazyImportObject_CAST(op) ((PyLazyImportObject *)(op))
 
 PyObject *
-_PyLazyImport_New(PyObject *builtins, PyObject *name, PyObject *fromlist)
+_PyLazyImport_New(_PyInterpreterFrame *frame, PyObject *builtins, PyObject *name, PyObject *fromlist)
 {
     PyLazyImportObject *m;
     if (!name || !PyUnicode_Check(name)) {
@@ -38,7 +38,6 @@ _PyLazyImport_New(PyObject *builtins, PyObject *name, PyObject *fromlist)
     m->lz_code = NULL;
     m->lz_instr_offset = -1;
 
-    _PyInterpreterFrame *frame = _PyEval_GetFrame();
     if (frame != NULL) {
         PyCodeObject *code = _PyFrame_GetCode(frame);
         if (code != NULL) {

Python/bytecodes.c

@@ -3021,7 +3021,7 @@ dummy_func(
             PyObject *res_o;
             if (PyLazyImport_CheckExact(PyStackRef_AsPyObjectBorrow(from))) {
                 res_o = _PyEval_LazyImportFrom(
-                    tstate, PyStackRef_AsPyObjectBorrow(from), name);
+                    tstate, frame, PyStackRef_AsPyObjectBorrow(from), name);
             }
             else {
                 res_o = _PyEval_ImportFrom(

Python/ceval.c

@@ -3831,7 +3831,7 @@ _PyEval_ImportFrom(PyThreadState *tstate, PyObject *v, PyObject *name)
 }
 
 PyObject *
-_PyEval_LazyImportFrom(PyThreadState *tstate, PyObject *v, PyObject *name)
+_PyEval_LazyImportFrom(PyThreadState *tstate, _PyInterpreterFrame *frame, PyObject *v, PyObject *name)
 {
     assert(PyLazyImport_CheckExact(v));
     assert(name);
@@ -3865,7 +3865,7 @@ _PyEval_LazyImportFrom(PyThreadState *tstate, PyObject *v, PyObject *name)
             if (from == NULL) {
                 return NULL;
             }
-            ret = _PyLazyImport_New(d->lz_builtins, from, name);
+            ret = _PyLazyImport_New(frame, d->lz_builtins, from, name);
             Py_DECREF(from);
             return ret;
         }
@@ -3879,12 +3879,12 @@ _PyEval_LazyImportFrom(PyThreadState *tstate, PyObject *v, PyObject *name)
             if (from == NULL) {
                 return NULL;
             }
-            ret = _PyLazyImport_New(d->lz_builtins, from, name);
+            ret = _PyLazyImport_New(frame, d->lz_builtins, from, name);
             Py_DECREF(from);
             return ret;
         }
     }
-    ret = _PyLazyImport_New(d->lz_builtins, d->lz_from, name);
+    ret = _PyLazyImport_New(frame, d->lz_builtins, d->lz_from, name);
     return ret;
 }
 
@@ -4178,7 +4178,7 @@ _PyEval_LoadGlobalStackRef(PyObject *globals, PyObject *builtins, PyObject *name
     }
 
     PyObject *res_o = PyStackRef_AsPyObjectBorrow(*writeto);
-    if (PyLazyImport_CheckExact(res_o)) {
+    if (res_o != NULL && PyLazyImport_CheckExact(res_o)) {
         PyObject *l_v = _PyImport_LoadLazyImportTstate(PyThreadState_GET(), res_o);
         PyStackRef_CLOSE(writeto[0]);
         if (l_v == NULL) {

Python/executor_cases.c.h

@@ -4363,7 +4363,7 @@ register_lazy_on_parent(PyThreadState *tstate, PyObject *name,
                 }
                 if (!contains) {
                     PyObject *lazy_module_attr = _PyLazyImport_New(
-                        builtins, parent, child
+                        tstate->current_frame, builtins, parent, child
                     );
                     if (lazy_module_attr == NULL) {
                         goto done;
@@ -4472,7 +4472,7 @@ _PyImport_LazyImportModuleLevelObject(PyThreadState *tstate,
     }
 
     // here, 'filter' is either NULL or is equivalent to a borrowed reference
-    PyObject *res = _PyLazyImport_New(builtins, abs_name, fromlist);
+    PyObject *res = _PyLazyImport_New(frame, builtins, abs_name, fromlist);
     if (res == NULL) {
         Py_DECREF(abs_name);
         return NULL;
@@ -5522,8 +5522,8 @@ publish_lazy_imports_on_module(PyThreadState *tstate,
         }
         // Create a new lazy module attr for the subpackage which was
         // previously lazily imported.
-        PyObject *lazy_module_attr = _PyLazyImport_New(builtins, name,
-                                                       attr_name);
+        PyObject *lazy_module_attr = _PyLazyImport_New(tstate->current_frame, builtins,
+                                                       name, attr_name);
         if (lazy_module_attr == NULL) {
             Py_DECREF(attr_name);
             return -1;