Fix accidentally clearing caught exception

msimacek · msimacek · commit 7483b9f8302a · 2024-06-27T09:32:00.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/ExternalFunctionNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/ExternalFunctionNodes.java
@@ -887,7 +887,7 @@ static Object invoke(VirtualFrame frame, Node inliningTarget, PythonThreadState
                  * Special case after calling a C function: transfer caught exception back to frame
                  * to simulate the global state semantics.
                  */
-                if (frame != null) {
+                if (frame != null && threadState.getCaughtException() != null) {
                     PArguments.setException(frame, threadState.getCaughtException());
                 }
                 IndirectCallContext.exit(frame, threadState, state);

Original file line number	Diff line number	Diff line change
`@@ -887,7 +887,7 @@ static Object invoke(VirtualFrame frame, Node inliningTarget, PythonThreadState`
`887`	`887`	`* Special case after calling a C function: transfer caught exception back to frame`
`888`	`888`	`* to simulate the global state semantics.`
`889`	`889`	`*/`
`890`		`- if (frame != null) {`
	`890`	`+ if (frame != null && threadState.getCaughtException() != null) {`
`891`	`891`	`PArguments.setException(frame, threadState.getCaughtException());`
`892`	`892`	`}`
`893`	`893`	`IndirectCallContext.exit(frame, threadState, state);`