ExternalFunctionInvokeNode: reacquire GIL only on exception path and transferToInterpreterAndInvalidate

Author: steve-s

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ThreadModuleBuiltins.java

@@ -230,8 +230,7 @@ long start(VirtualFrame frame, Object cls, Object callable, Object args, Object
             // TODO: python thread stack size != java thread stack size
             // ignore setting the stack size for the moment
             TruffleThreadBuilder threadBuilder = env.newTruffleThreadBuilder(() -> {
-                GilNode.UncachedAcquire gil = GilNode.uncachedAcquire();
-                try {
+                try (GilNode.UncachedAcquire gil = GilNode.uncachedAcquire()) {
                     // the increment is protected by the gil
                     int curCount = (int) HiddenAttr.ReadNode.executeUncached(threadModule, THREAD_COUNT, 0);
                     HiddenAttr.WriteNode.executeUncached(threadModule, THREAD_COUNT, curCount + 1);
@@ -252,8 +251,6 @@ long start(VirtualFrame frame, Object cls, Object callable, Object args, Object
                         curCount = (int) HiddenAttr.ReadNode.executeUncached(threadModule, THREAD_COUNT, 1);
                         HiddenAttr.WriteNode.executeUncached(threadModule, THREAD_COUNT, curCount - 1);
                     }
-                } finally {
-                    gil.close();
                 }
             }).context(env.getContext()).threadGroup(context.getThreadGroup());
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/ExternalFunctionNodes.java

@@ -851,15 +851,17 @@ static Object invoke(VirtualFrame frame, Node inliningTarget, PythonContext ctx,
             } catch (ArityException e) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 throw PRaiseNode.raiseUncached(inliningTarget, TypeError, ErrorMessages.CALLING_NATIVE_FUNC_EXPECTED_ARGS, name, e.getExpectedMinArity(), e.getActualArity());
-            } finally {
-                CApiTiming.exit(timing);
+            } catch (Throwable exception) {
                 /*
                  * Always re-acquire the GIL here. This is necessary because it could happen that C
                  * extensions are releasing the GIL and if then an LLVM exception occurs, C code
                  * wouldn't re-acquire it (unexpectedly).
                  */
-                gilNode.acquire(ctx);
-
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                GilNode.uncachedAcquire();
+                throw exception;
+            } finally {
+                CApiTiming.exit(timing);
                 /*
                  * Special case after calling a C function: transfer caught exception back to frame
                  * to simulate the global state semantics.