check function result first, then convert to Python object

timfel · timfel · commit e40da5e570d9 · 2018-05-15T14:03:23.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TruffleCextBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TruffleCextBuiltins.java
@@ -542,7 +542,7 @@ public Object execute(VirtualFrame frame) {
                 arguments[i] = toSulongNode.execute(frameArgs[i + PArguments.USER_ARGUMENTS_OFFSET]);
             }
             try {
-                return fromNative(checkFunctionResult(asPythonObjectNode.execute(ForeignAccess.sendExecute(executeNode, callable, arguments))));
+                return fromNative(asPythonObjectNode.execute(checkFunctionResult(ForeignAccess.sendExecute(executeNode, callable, arguments))));
             } catch (UnsupportedTypeException | ArityException | UnsupportedMessageException e) {
                 CompilerDirectives.transferToInterpreter();
                 throw new RuntimeException(e.toString());

Original file line number	Diff line number	Diff line change
`@@ -542,7 +542,7 @@ public Object execute(VirtualFrame frame) {`
`542`	`542`	`arguments[i] = toSulongNode.execute(frameArgs[i + PArguments.USER_ARGUMENTS_OFFSET]);`
`543`	`543`	`}`
`544`	`544`	`try {`
`545`		`- return fromNative(checkFunctionResult(asPythonObjectNode.execute(ForeignAccess.sendExecute(executeNode, callable, arguments))));`
	`545`	`+ return fromNative(asPythonObjectNode.execute(checkFunctionResult(ForeignAccess.sendExecute(executeNode, callable, arguments))));`
`546`	`546`	`} catch (UnsupportedTypeException \| ArityException \| UnsupportedMessageException e) {`
`547`	`547`	`CompilerDirectives.transferToInterpreter();`
`548`	`548`	`throw new RuntimeException(e.toString());`