Patch to resolve conflicts as provided by Jakub Chaloupka

oracle · Sep 25, 2024 · 3e1f2b4 · 3e1f2b4
1 parent b8e8590
commit 3e1f2b4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/truffle/src/com.oracle.truffle.api.test/src/META-INF/native-image/reflect-config.json b/truffle/src/com.oracle.truffle.api.test/src/META-INF/native-image/reflect-config.json
@@ -261,5 +261,9 @@
   {
     "name": "java.nio.HeapByteBuffer",
     "allPublicMethods": true
+  },
+  {
+    "name": "org.hamcrest.core.StringContains",
+    "allPublicMethods": true
   }
 ]
diff --git a/truffle/src/com.oracle.truffle.api/snapshot.sigtest b/truffle/src/com.oracle.truffle.api/snapshot.sigtest
@@ -325,9 +325,10 @@ meth public com.oracle.truffle.api.TruffleContext$Builder onExited(java.util.fun
 meth public com.oracle.truffle.api.TruffleContext$Builder option(java.lang.String,java.lang.String)
 meth public com.oracle.truffle.api.TruffleContext$Builder options(java.util.Map<java.lang.String,java.lang.String>)
 meth public com.oracle.truffle.api.TruffleContext$Builder out(java.io.OutputStream)
+meth public com.oracle.truffle.api.TruffleContext$Builder threadAccessDeniedHandler(java.util.function.Consumer<java.lang.String>)
 meth public com.oracle.truffle.api.TruffleContext$Builder timeZone(java.time.ZoneId)
 supr java.lang.Object
-hfds allowCreateProcess,allowCreateThread,allowEnvironmentAccess,allowHostClassLoading,allowHostLookup,allowIO,allowInnerContextOptions,allowNativeAccess,allowPolyglotAccess,arguments,config,environment,err,in,inheritAccess,initializeCreatorContext,onCancelled,onClosed,onExited,options,out,permittedLanguages,sharingEnabled,sourceEnvironment,timeZone
+hfds allowCreateProcess,allowCreateThread,allowEnvironmentAccess,allowHostClassLoading,allowHostLookup,allowIO,allowInnerContextOptions,allowNativeAccess,allowPolyglotAccess,arguments,config,environment,err,in,inheritAccess,initializeCreatorContext,onCancelled,onClosed,onExited,options,out,permittedLanguages,sharingEnabled,sourceEnvironment,threadAccessDeniedHandler,timeZone
 
 CLSS public final com.oracle.truffle.api.TruffleFile
 fld public final static com.oracle.truffle.api.TruffleFile$AttributeDescriptor<java.lang.Boolean> IS_DIRECTORY

diff --git a/.../src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotContextImpl.java b/.../src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotContextImpl.java
@@ -819,6 +819,7 @@ void resume(Future<Void> pauseFuture) {
     Object[] enterThreadChanged(boolean enterReverted, boolean pollSafepoint, boolean mustSucceed, PolyglotThreadTask polyglotThreadFirstEnter,
                     boolean leaveAndEnter) {
         PolyglotThreadInfo enteredThread = null;
+        boolean localEnterReverted = enterReverted;
         Object[] prev = null;
         Thread current = Thread.currentThread();
         try {
@@ -841,7 +842,7 @@ Object[] enterThreadChanged(boolean enterReverted, boolean pollSafepoint, boolea
                         synchronized (this) {
                             PolyglotThreadInfo threadInfo = getCurrentThreadInfo();
 
-                            if (enterReverted && threadInfo.getEnteredCount() == 0) {
+                            if (localEnterReverted && threadInfo.getEnteredCount() == 0) {
                                 threadLocalActions.notifyThreadActivation(threadInfo, false);
                                 if ((state.isCancelling() || state.isExiting() || state == State.CLOSED_CANCELLED || state == State.CLOSED_EXITED) && !threadInfo.isActive()) {
                                     notifyThreadClosed(threadInfo);
@@ -854,6 +855,7 @@ Object[] enterThreadChanged(boolean enterReverted, boolean pollSafepoint, boolea
                                     notifyAll();
                                 }
                             }
+                            localEnterReverted = false;
                             if (deactivateSafepoints && threadInfo != PolyglotThreadInfo.NULL) {
                                 threadLocalActions.notifyThreadActivation(threadInfo, false);
                             }