[GR-16667] add missing lock Execution context enter / exit pair (callee context)

PullRequest: graalpython/558

Author: cosminbasca

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/ExecutionContext.java

@@ -316,6 +316,10 @@ public abstract static class IndirectCalleeContext {
          * Prepare a call from a foreign frame to a Python function.
          */
         public static PFrame.Reference enter(PythonContext context, Object[] pArguments, RootCallTarget callTarget) {
+            if (!context.getSingleThreadedAssumption().isValid()) {
+                context.acquireInteropLock();
+            }
+
             Reference popTopFrameInfo = context.popTopFrameInfo();
             PArguments.setCallerFrameInfo(pArguments, popTopFrameInfo);
 
@@ -344,6 +348,9 @@ public static void exit(PythonContext context, PFrame.Reference frameInfo) {
             // topframeref was marked as escaped, it'll be materialized at the
             // latest needed time
             context.setTopFrameInfo(frameInfo);
+            if (!context.getSingleThreadedAssumption().isValid()) {
+                context.releaseInteropLock();
+            }
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonContext.java

@@ -36,11 +36,9 @@
 import java.text.MessageFormat;
 import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Supplier;
 
-import com.oracle.truffle.api.TruffleFile;
 import org.graalvm.nativeimage.ImageInfo;
 import org.graalvm.options.OptionValues;
 
@@ -50,8 +48,8 @@
 import com.oracle.graal.python.builtins.objects.cext.PythonNativeClass;
 import com.oracle.graal.python.builtins.objects.common.HashingStorage;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
-import com.oracle.graal.python.builtins.objects.list.PList;
 import com.oracle.graal.python.builtins.objects.frame.PFrame;
+import com.oracle.graal.python.builtins.objects.list.PList;
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
 import com.oracle.graal.python.builtins.objects.str.PString;
 import com.oracle.graal.python.nodes.SpecialAttributeNames;
@@ -63,6 +61,7 @@
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.Truffle;
+import com.oracle.truffle.api.TruffleFile;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleLanguage.Env;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -119,7 +118,7 @@ public final class PythonContext {
     private static final Assumption singleNativeContext = Truffle.getRuntime().createAssumption("single native context assumption");
 
     /* A lock for interop calls when this context is used by multiple threads. */
-    private Lock interopLock;
+    private ReentrantLock interopLock;
 
     @CompilationFinal private HashingStorage.Equivalence slowPathEquivalence;
 
@@ -604,7 +603,9 @@ public void acquireInteropLock() {
 
     @TruffleBoundary
     public void releaseInteropLock() {
-        interopLock.unlock();
+        if (interopLock.isLocked()) {
+            interopLock.unlock();
+        }
     }
 
     @TruffleBoundary