Chain exceptions during cleanup.

ericsnowcurrently · ericsnowcurrently · commit 678aed838ba9 · 2017-11-27T17:21:09.000-06:00
diff --git a/Modules/_interpretersmodule.c b/Modules/_interpretersmodule.c
@@ -180,9 +180,12 @@ _run_string_in_main(PyInterpreterState *interp, const char *codestr,
     }
 
     // Restore __main__.
+    PyObject *exc = NULL, *value = NULL, *tb = NULL;
+    PyErr_Fetch(&exc, &value, &tb);
     if (PyMapping_SetItemString(interp->modules, "__main__", main_mod) < 0) {
-        // XXX Chain exceptions...
-        //PyErr_Restore(exc, value, tb);
+        _PyErr_ChainExceptions(exc, value, tb);
+    } else {
+        PyErr_Restore(exc, value, tb);
     }
     Py_DECREF(main_mod);
 

Original file line number	Diff line number	Diff line change
`@@ -180,9 +180,12 @@ _run_string_in_main(PyInterpreterState interp, const char codestr,`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`// Restore __main__.`
	`183`	`+ PyObject exc = NULL, value = NULL, *tb = NULL;`
	`184`	`+ PyErr_Fetch(&exc, &value, &tb);`
`183`	`185`	`if (PyMapping_SetItemString(interp->modules, "__main__", main_mod) < 0) {`
`184`		`- // XXX Chain exceptions...`
`185`		`- //PyErr_Restore(exc, value, tb);`
	`186`	`+ _PyErr_ChainExceptions(exc, value, tb);`
	`187`	`+ } else {`
	`188`	`+ PyErr_Restore(exc, value, tb);`
`186`	`189`	`}`
`187`	`190`	`Py_DECREF(main_mod);`
`188`	`191`