Error handling tweaks

Author: JukkaL

mypyc/codegen/emitmodule.py

@@ -1266,7 +1266,7 @@ def emit_module_init_func(
         # CPyImport_ImportNative can detect that this module is already
         # being initialized and avoid re-executing the module body.
         emitter.emit_line(f'modname = PyUnicode_FromString("{module_name}");')
-        emitter.emit_line("if (modname == NULL) goto fail;")
+        emitter.emit_line("if (modname == NULL) CPyError_OutOfMemory();")
         emitter.emit_line(
             f"if (PyObject_SetItem(PyImport_GetModuleDict(), modname, {module_static}) < 0)"
         )
@@ -1280,12 +1280,13 @@ def emit_module_init_func(
         emitter.emit_line("{")
         emitter.emit_line("    PyObject *exc_type, *exc_val, *exc_tb;")
         emitter.emit_line("    PyErr_Fetch(&exc_type, &exc_val, &exc_tb);")
-        emitter.emit_line(f'    modname = PyUnicode_FromString("{module_name}");')
-        emitter.emit_line("    if (modname != NULL) {")
-        emitter.emit_line("        PyObject_DelItem(PyImport_GetModuleDict(), modname);")
-        emitter.emit_line("        PyErr_Clear();")
+        emitter.emit_line("    if (modname == NULL) {")
+        emitter.emit_line(f'        modname = PyUnicode_FromString("{module_name}");')
+        emitter.emit_line("        if (modname == NULL) CPyError_OutOfMemory();")
         emitter.emit_line("    }")
-        emitter.emit_line("    Py_XDECREF(modname);")
+        emitter.emit_line("    PyObject_DelItem(PyImport_GetModuleDict(), modname);")
+        emitter.emit_line("    PyErr_Clear();")
+        emitter.emit_line("    Py_DECREF(modname);")
         emitter.emit_line(f"    Py_CLEAR({module_static});")
         emitter.emit_line("    PyErr_Restore(exc_type, exc_val, exc_tb);")
         emitter.emit_line("}")

mypyc/irbuild/mapper.py

@@ -233,7 +233,6 @@ def is_native_module(self, module: str) -> bool:
         return module in self.group_map
 
     def is_native_ref_expr(self, expr: RefExpr) -> bool:
-        # TODO: What if native package has a non-native submodule?
         if expr.node is None:
             return False
         if "." in expr.node.fullname:

mypyc/lib-rt/misc_ops.c

@@ -1207,13 +1207,16 @@ static int CPyImport_InitSpecClasses(void) {
         Py_CLEAR(CPyImport_ExtFileLoaderClass);
         return -1;
     }
-    CPyImport_SpecKwnames = PyTuple_Pack(2,
-        PyUnicode_InternFromString("origin"),
-        PyUnicode_InternFromString("is_package"));
+    PyObject *origin_str = PyUnicode_InternFromString("origin");
+    PyObject *is_package_str = PyUnicode_InternFromString("is_package");
+    if (origin_str == NULL || is_package_str == NULL) {
+        CPyError_OutOfMemory();
+    }
+    CPyImport_SpecKwnames = PyTuple_Pack(2, origin_str, is_package_str);
+    Py_DECREF(origin_str);
+    Py_DECREF(is_package_str);
     if (CPyImport_SpecKwnames == NULL) {
-        Py_CLEAR(CPyImport_ModuleSpecClass);
-        Py_CLEAR(CPyImport_ExtFileLoaderClass);
-        return -1;
+        CPyError_OutOfMemory();
     }
     return 0;
 }
@@ -1258,9 +1261,7 @@ static int CPyImport_SetModuleFile(PyObject *modobj, PyObject *module_name,
         PyObject *dot_str = PyUnicode_FromString(".");
         PyObject *sep_str = PyUnicode_FromOrdinal(sep_char);
         if (dot_str == NULL || sep_str == NULL) {
-            Py_XDECREF(dot_str);
-            Py_XDECREF(sep_str);
-            return -1;
+            CPyError_OutOfMemory();
         }
         PyObject *module_path = PyUnicode_Replace(module_name, dot_str, sep_str, -1);
         Py_DECREF(dot_str);
@@ -1331,8 +1332,7 @@ static int CPyImport_SetModulePath(PyObject *modobj) {
     }
     PyObject *path_list = PyList_New(1);
     if (path_list == NULL) {
-        Py_DECREF(dir);
-        return -1;
+        CPyError_OutOfMemory();
     }
     PyList_SET_ITEM(path_list, 0, dir);  // steals ref to dir
     int rc = PyObject_SetAttrString(modobj, "__path__", path_list);
@@ -1425,12 +1425,11 @@ PyObject *CPyImport_ImportNative(PyObject *module_name,
         // Import the parent package first to preserve import ordering semantics.
         PyObject *parent_name = PyUnicode_Substring(module_name, 0, dot);
         if (parent_name == NULL) {
-            return NULL;
+            CPyError_OutOfMemory();
         }
         child_name = PyUnicode_Substring(module_name, dot + 1, name_len);
         if (child_name == NULL) {
-            Py_DECREF(parent_name);
-            return NULL;
+            CPyError_OutOfMemory();
         }
         parent_module = PyImport_Import(parent_name);
         Py_DECREF(parent_name);
@@ -1509,10 +1508,12 @@ PyObject *CPyImport_ImportNative(PyObject *module_name,
                 package_name = PyUnicode_Substring(module_name, 0, dot);
             } else {
                 package_name = PyUnicode_FromString("");
+                if (package_name == NULL) {
+                    CPyError_OutOfMemory();
+                }
             }
-            if (package_name == NULL ||
-                    PyObject_SetAttrString(modobj, "__package__", package_name) < 0) {
-                Py_XDECREF(package_name);
+            if (PyObject_SetAttrString(modobj, "__package__", package_name) < 0) {
+                Py_DECREF(package_name);
                 goto fail;
             }
             Py_DECREF(package_name);