From d5543c8f78e594adbb09114db272836362532c69 Mon Sep 17 00:00:00 2001
From: ahgamut <41098605+ahgamut@users.noreply.github.com>
Date: Sun, 15 May 2022 02:28:22 +0530
Subject: [PATCH] remove hacky PyBuiltin_Exec

now we know what happens inside, so we just call the actual function
PyEval_EvalCode with the right setup.
---
 third_party/python/Include/bltinmodule.h |  2 --
 third_party/python/Python/import.c       | 21 ++++++++++++++++-----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/third_party/python/Include/bltinmodule.h b/third_party/python/Include/bltinmodule.h
index ec250cf3c..e5b47e8dd 100644
--- a/third_party/python/Include/bltinmodule.h
+++ b/third_party/python/Include/bltinmodule.h
@@ -8,7 +8,5 @@ extern PyTypeObject PyFilter_Type;
 extern PyTypeObject PyMap_Type;
 extern PyTypeObject PyZip_Type;
 
-PyObject *PyBuiltin_Exec(PyObject *, PyObject *, PyObject *, PyObject *);
-
 COSMOPOLITAN_C_END_
 #endif /* !Py_BLTINMODULE_H */
diff --git a/third_party/python/Python/import.c b/third_party/python/Python/import.c
index 994dfdf97..78c017011 100644
--- a/third_party/python/Python/import.c
+++ b/third_party/python/Python/import.c
@@ -83,6 +83,8 @@ static PyObject *extensions = NULL;
 static PyObject *initstr = NULL;
 
 static struct stat stinfo;
+_Py_IDENTIFIER(__builtins__);
+_Py_IDENTIFIER(_load_module_shim);
 /*[clinic input]
 module _imp
 [clinic start generated code]*/
@@ -548,7 +550,7 @@ PyImport_GetMagicNumber(void)
     static char raw_magic_number[4] = {0, 0, '\r', '\n'};
     WRITE16LE(raw_magic_number, 3390);
     /* so many indirections for a single constant */
-    /* 
+    /*
     PyInterpreterState *interp = PyThreadState_Get()->interp;
     PyObject *external, *pyc_magic;
 
@@ -2528,7 +2530,6 @@ static PyObject *SFLObject_load_module(SourcelessFileLoader *self,
   PyObject *fullname = NULL;
   PyObject *res = NULL;
   PyInterpreterState *interp = PyThreadState_GET()->interp;
-  _Py_IDENTIFIER(_load_module_shim);
 
   if (!_PyArg_ParseStack(args, nargs, "|z:load_module", &name)) goto exit;
   if (!name) name = self->name;
@@ -2541,8 +2542,6 @@ static PyObject *SFLObject_load_module(SourcelessFileLoader *self,
     fullname = PyUnicode_FromStringAndSize(self->name, self->namelen);
   }
 
-  // if((bootstrap = PyObject_GetAttrString(interp->importlib, "_bootstrap")) ==
-  // NULL) goto exit;
   res = _PyObject_CallMethodIdObjArgs(
       interp->importlib, &PyId__load_module_shim, self, fullname, NULL);
   Py_XDECREF(bootstrap);
@@ -2561,6 +2560,8 @@ static PyObject *SFLObject_exec_module(SourcelessFileLoader *self,
   PyObject *module = NULL;
   PyObject *name = NULL;
   PyObject *code = NULL;
+  PyObject *globals = NULL;
+  PyObject *v = NULL;
 
   if (!PyArg_Parse(arg, "O:exec_module", &module)) goto exit;
 
@@ -2573,7 +2574,17 @@ static PyObject *SFLObject_exec_module(SourcelessFileLoader *self,
     }
     goto exit;
   }
-  return PyBuiltin_Exec(module, code, PyModule_GetDict(module), Py_None);
+  globals = PyModule_GetDict(module);
+  if (_PyDict_GetItemId(globals, &PyId___builtins__) == NULL) {
+    if (_PyDict_SetItemId(globals, &PyId___builtins__,
+                          PyEval_GetBuiltins()) != 0)
+        return NULL;
+  }
+  v = PyEval_EvalCode(code, globals, globals);
+  if(v != NULL) {
+      Py_DECREF(v);
+      Py_RETURN_NONE;
+  }
 
 exit:
   Py_XDECREF(name);