Set PException.message when leaving Python

fangerer · fangerer · commit 9d2beb122b2c · 2021-03-19T11:11:57.000+01:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/control/TopLevelExceptionHandler.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/control/TopLevelExceptionHandler.java
@@ -171,7 +171,11 @@ private PException handlePythonException(PBaseException pythonException) {
                 throw new PythonExitException(this, 1);
             }
         }
-        throw pythonException.getExceptionForReraise(pythonException.getTraceback());
+        // Before we leave Python, format the message since outside the context
+        PException exceptionForReraise = pythonException.getExceptionForReraise(pythonException.getTraceback());
+        PythonObjectLibrary pythonObjectLibrary = PythonObjectLibrary.getUncached();
+        exceptionForReraise.setMessage(exceptionForReraise.getUnreifiedException().getFormattedMessage(pythonObjectLibrary, pythonObjectLibrary));
+        throw exceptionForReraise;
     }
 
     @TruffleBoundary

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,11 @@ private PException handlePythonException(PBaseException pythonException) {`
`171`	`171`	`throw new PythonExitException(this, 1);`
`172`	`172`	`}`
`173`	`173`	`}`
`174`		`- throw pythonException.getExceptionForReraise(pythonException.getTraceback());`
	`174`	`+ // Before we leave Python, format the message since outside the context`
	`175`	`+ PException exceptionForReraise = pythonException.getExceptionForReraise(pythonException.getTraceback());`
	`176`	`+ PythonObjectLibrary pythonObjectLibrary = PythonObjectLibrary.getUncached();`
	`177`	`+ exceptionForReraise.setMessage(exceptionForReraise.getUnreifiedException().getFormattedMessage(pythonObjectLibrary, pythonObjectLibrary));`
	`178`	`+ throw exceptionForReraise;`
`175`	`179`	`}`
`176`	`180`
`177`	`181`	`@TruffleBoundary`