[GR-16045] Fix CheckGraalIntrinsics failure with latest jdk11u.

PullRequest: graal/3656
physicsfamily · May 27, 2019 · f3a3576 · f3a3576
2 parents a541fb5 + e0a7656
commit f3a3576
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/common.hocon b/common.hocon
@@ -10,7 +10,7 @@ jdks: {
   openjdk8:        {name : openjdk,   version : "8u212-jvmci-20-b01", platformspecific: true}
   oraclejdk8Debug: {name : oraclejdk, version : "8u212-jvmci-20-b01-fastdebug", platformspecific: true}
   oraclejdk11:     {name : oraclejdk, version : "11.0.3+12", platformspecific: true}
-  openjdk11:       {name : openjdk,   version : "11.0.3+12", platformspecific: true}
+  openjdk11:       {name : openjdk,   version : "11.0.3+7", platformspecific: true}
 }
 
 # This must always point to HEAD in the master branch but can be used to point

diff --git a/...lvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CheckGraalIntrinsics.java b/...lvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CheckGraalIntrinsics.java
@@ -386,21 +386,17 @@ public CheckGraalIntrinsics() {
         if (isJDK11OrHigher()) {
             // Relevant for Java flight recorder
             add(toBeInvestigated,
+                            "java/lang/CharacterDataLatin1.isDigit(I)Z",
+                            "java/lang/CharacterDataLatin1.isLowerCase(I)Z",
+                            "java/lang/CharacterDataLatin1.isUpperCase(I)Z",
+                            "java/lang/CharacterDataLatin1.isWhitespace(I)Z",
                             "jdk/jfr/internal/JVM.getEventWriter()Ljava/lang/Object;");
             if (!config.useBase64Intrinsics()) {
                 add(ignore,
                                 "java/util/Base64$Encoder.encodeBlock([BII[BIZ)V");
             }
         }
 
-        if (isJDK12OrHigher()) {
-            add(toBeInvestigated,
-                            "java/lang/CharacterDataLatin1.isDigit(I)Z",
-                            "java/lang/CharacterDataLatin1.isLowerCase(I)Z",
-                            "java/lang/CharacterDataLatin1.isUpperCase(I)Z",
-                            "java/lang/CharacterDataLatin1.isWhitespace(I)Z");
-        }
-
         if (isJDK13OrHigher()) {
             add(toBeInvestigated,
                             "java/lang/Math.abs(I)I",