[GR-32410] Update to jvmci-21.3-b05.

PullRequest: graal/10052

Author: gilles-duboscq

common.json

@@ -2,20 +2,20 @@
   "README": "This file contains definitions that are useful for the hocon and jsonnet CI files of multiple repositories.",
 
   "jdks": {
-    "openjdk8":           {"name": "openjdk",   "version": "8u302+06-jvmci-21.3-b04", "platformspecific": true },
-    "oraclejdk8":         {"name": "oraclejdk", "version": "8u311+10-jvmci-21.3-b04", "platformspecific": true },
-    "oraclejdk8Debug":    {"name": "oraclejdk", "version": "8u311+10-jvmci-21.3-b04-fastdebug", "platformspecific": true },
+    "openjdk8":           {"name": "openjdk",   "version": "8u302+06-jvmci-21.3-b05", "platformspecific": true },
+    "oraclejdk8":         {"name": "oraclejdk", "version": "8u311+11-jvmci-21.3-b05", "platformspecific": true },
+    "oraclejdk8Debug":    {"name": "oraclejdk", "version": "8u311+11-jvmci-21.3-b05-fastdebug", "platformspecific": true },
 
     "openjdk11":          {"name": "openjdk",   "version": "11.0.11+9", "platformspecific": true },
     "oraclejdk11":        {"name": "oraclejdk", "version": "11.0.11+9", "platformspecific": true },
-    "labsjdk-ce-11":      {"name": "labsjdk",   "version": "ce-11.0.13+7-jvmci-21.3-b04", "platformspecific": true },
-    "labsjdk-ee-11":      {"name": "labsjdk",   "version": "ee-11.0.13+10-jvmci-21.3-b04", "platformspecific": true },
+    "labsjdk-ce-11":      {"name": "labsjdk",   "version": "ce-11.0.13+7-jvmci-21.3-b05", "platformspecific": true },
+    "labsjdk-ee-11":      {"name": "labsjdk",   "version": "ee-11.0.13+10-jvmci-21.3-b05", "platformspecific": true },
 
     "oraclejdk17":        {"name": "oraclejdk", "version": "17.0.1+2", "platformspecific": true },
-    "labsjdk-ce-17":      {"name": "labsjdk",   "version": "ce-17+35-jvmci-21.3-b04", "platformspecific": true },
-    "labsjdk-ce-17Debug": {"name": "labsjdk",   "version": "ce-17+35-jvmci-21.3-b04-debug", "platformspecific": true },
-    "labsjdk-ee-17":      {"name": "labsjdk",   "version": "ee-17.0.1+12-jvmci-21.3-b04", "platformspecific": true },
-    "labsjdk-ee-17Debug": {"name": "labsjdk",   "version": "ee-17.0.1+12-jvmci-21.3-b04-debug", "platformspecific": true }
+    "labsjdk-ce-17":      {"name": "labsjdk",   "version": "ce-17.0.1+12-jvmci-21.3-b05", "platformspecific": true },
+    "labsjdk-ce-17Debug": {"name": "labsjdk",   "version": "ce-17.0.1+12-jvmci-21.3-b05-debug", "platformspecific": true },
+    "labsjdk-ee-17":      {"name": "labsjdk",   "version": "ee-17.0.1+12-jvmci-21.3-b05", "platformspecific": true },
+    "labsjdk-ee-17Debug": {"name": "labsjdk",   "version": "ee-17.0.1+12-jvmci-21.3-b05-debug", "platformspecific": true }
   },
 
   "COMMENT" : "The devkits versions reflect those used to build the JVMCI JDKs (e.g., see devkit_platform_revisions in <jdk>/make/conf/jib-profiles.js)",

compiler/src/org.graalvm.libgraal/src/org/graalvm/libgraal/LibGraalScope.java

@@ -228,14 +228,20 @@ public long getIsolateThreadAddress() {
 
     @Override
     public void close() {
+        // Reset the currentScope thread local before detaching. Detaching may trigger HotSpot to
+        // shutdown the libgraal isolate. That involves re-attaching the current thread to the
+        // libgraal isolate with a *new* isolate thread for calling
+        // HotSpotJVMCIRuntime.shutdown(). In the scope of the latter call, if a new LibGraalScope
+        // is opened, it must not see this LibGraalScope as its parent otherwise it will use the
+        // closed and discarded isolate thread (i.e. this.shared.isolateThread).
+        currentScope.set(parent);
         if (parent == null && shared.detachAction != null) {
             if (shared.detachAction == DetachAction.DETACH) {
                 detachThreadFrom(shared.isolateThread);
             } else {
                 LibGraal.detachCurrentThread(shared.detachAction == DetachAction.DETACH_RUNTIME_AND_RELEASE);
             }
         }
-        currentScope.set(parent);
     }
 
     // Shared support for the LibGraal overlays