Merge pull request #36 from hhandoko/feature/graal_21

Feature - Graal 21.0.0.2

Author: hhandoko

.sdkmanrc

@@ -1,3 +1,3 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
-java=20.2.0.r11-grl
+java=21.0.0.2.r11-grl

README.md

@@ -15,7 +15,7 @@ For more information on how to this works with other frontends/backends, head ov
 
 Ensure the following dependencies are installed and configured:
 
-  - [Java SDK] 8 or 11 or [GraalVM] 20.2.x (both Java 8 and 11 variants)
+  - [Java SDK] 8 or 11 or [GraalVM] 21.0.x (both Java 8 and 11 variants)
   - [sbt] 1.5.x
 
 ### Setup Steps
@@ -45,6 +45,7 @@ To package and run it as an uber-jar:
 Ensure Graal is downloaded and its binaries folder added to `PATH`. The most convenient way is to use [sdkman] to switch between different Java SDK versions (Graal included).
 
   - Run `sdk env` to initialise the shell session using [sdkman]
+  - Run `gu install native-image` to configure the native-image binary (incl. agent)
 
 To generate assisted configuration for native image:
 
@@ -83,17 +84,16 @@ Backend API implementation:
 
 Please read [PROGRESS] for more details.
 
+# Notes
+
+Scalameta substitutions ([svm-subs]) are copied over into the repository as the library has not had any updates for a while.
+
 # Issues
 
   - Native image generation sometimes fail with non-initialized charset issue error message (simply retry until succeeds)
   - Native image generation with `jwt-scala` fails ([oracle/graal/#1152](https://github.com/oracle/graal/issues/1152))
   - JWT token decoding in native image fails ([oracle/graal/#1240](https://github.com/oracle/graal/issues/1240))
 
-# Pending Updates
-
-  - GraalVM `21.0.0.2`:
-    - Pending `org.scalameta %% svm-subs` support
-
 # Contributing
 
 We follow the "[feature-branch]" Git workflow.
@@ -137,4 +137,5 @@ Please read [CONTRIBUTING] for more details.
 [newman]: https://github.com/postmanlabs/newman
 [PROGRESS]: https://github.com/hhandoko/scala-http4s-realworld-example-app/blob/master/PROGRESS.md
 [sbt]: https://www.scala-sbt.org/
+[svm-subs]: https://github.com/scalameta/svm-subs
 [sdkman]: https://sdkman.io/

project/Common.scala

@@ -32,8 +32,8 @@ object Common {
   private val kindProjectorVersion    = "0.11.3"
 
   // Graal native-image compiler dependency versions
-  private val graalVmVersion = "20.2.0"
-  private val jnaVersion     = "5.7.0"
+  private val graalVmVersion = "21.0.0.2"
+  private val jnaVersion     = "5.8.0"
 
   final val settings: Seq[Setting[_]] =
     projectSettings ++ dependencySettings ++ flywaySettings ++ compilerPlugins
@@ -62,7 +62,6 @@ object Common {
       "org.http4s"              %% "http4s-circe"           % http4sVersion,
       "org.http4s"              %% "http4s-dsl"             % http4sVersion,
       "org.postgresql"          %  "postgresql"             % postgresVersion,
-      "org.scalameta"           %% "svm-subs"               % graalVmVersion,
       "org.specs2"              %% "specs2-core"            % specs2Version % Test,
       "org.tpolecat"            %% "doobie-core"            % doobieVersion,
       "org.tpolecat"            %% "doobie-h2"              % doobieVersion % Test,

scripts/docker/Graal.Dockerfile

@@ -1,4 +1,4 @@
-FROM        oracle/graalvm-ce:20.2.0-java11 as assembler
+FROM        ghcr.io/graalvm/graalvm-ce:java11-21.0.0.2 as assembler
 LABEL       maintainer="Herdy Handoko <[email protected]>"
 LABEL       description="http4s GraalVM assembler"
 
@@ -18,7 +18,7 @@ RUN         ./sbt/bin/sbt -mem 4096 clean stage
 
 # ~~~~~~
 
-FROM        oracle/graalvm-ce:20.2.0-java11 as packager_graal
+FROM        ghcr.io/graalvm/graalvm-ce:java11-21.0.0.2 as packager_graal
 LABEL       maintainer="Herdy Handoko <[email protected]>"
 LABEL       description="http4s GraalVM packager"
 
@@ -33,7 +33,7 @@ RUN         mkdir -p app \
 
 # ~~~~~~
 
-FROM        oracle/graalvm-ce:20.2.0-java11
+FROM        ghcr.io/graalvm/graalvm-ce:java11-21.0.0.2
 LABEL       maintainer="Herdy Handoko <[email protected]>"
 LABEL       description="http4s GraalVM (JIT) runtime container"
 

scripts/docker/Native.Dockerfile

@@ -1,4 +1,4 @@
-FROM        oracle/graalvm-ce:20.2.0-java11 as assembler
+FROM        ghcr.io/graalvm/graalvm-ce:java11-21.0.0.2 as assembler
 LABEL       maintainer="Herdy Handoko <[email protected]>"
 LABEL       description="http4s GraalVM assembler"
 
@@ -18,7 +18,7 @@ RUN         ./sbt/bin/sbt -mem 4096 clean stage
 
 # ~~~~~~
 
-FROM        oracle/graalvm-ce:20.2.0-java11 as packager_native
+FROM        ghcr.io/graalvm/graalvm-ce:java11-21.0.0.2 as packager_native
 LABEL       maintainer="Herdy Handoko <[email protected]>"
 LABEL       description="http4s GraalVM native-image packager"
 

scripts/graal/VERSION.txt

@@ -1 +1 @@
-20.2.0
+21.0.0.2

src/main/java/scala/meta/internal/svm_subs/HasReleaseFenceMethod.java

@@ -0,0 +1,16 @@
+package scala.meta.internal.svm_subs;
+
+import java.util.function.Predicate;
+
+final class HasReleaseFenceMethod implements Predicate<String> {
+    @Override
+    public boolean test(String className) {
+        try {
+            final Class<?> classForName = Class.forName(className);
+            classForName.getMethod("releaseFence");
+            return true;
+        } catch (Exception cnfe) {
+            return false;
+        }
+    }
+}

src/main/java/scala/meta/internal/svm_subs/Target_scala_collection_immutable_VM.java

@@ -0,0 +1,13 @@
+package scala.meta.internal.svm_subs;
+
+import com.oracle.svm.core.annotate.Substitute;
+import com.oracle.svm.core.annotate.TargetClass;
+
+@TargetClass(className = "scala.collection.immutable.VM", onlyWith = HasReleaseFenceMethod.class)
+final class Target_scala_collection_immutable_VM {
+
+    @Substitute
+    public static void releaseFence() {
+        UnsafeUtils.UNSAFE.storeFence();
+    }
+}

src/main/java/scala/meta/internal/svm_subs/Target_scala_runtime_Statics.java

@@ -0,0 +1,13 @@
+package scala.meta.internal.svm_subs;
+
+import com.oracle.svm.core.annotate.Substitute;
+import com.oracle.svm.core.annotate.TargetClass;
+
+@TargetClass(className = "scala.runtime.Statics", onlyWith = HasReleaseFenceMethod.class)
+final class Target_scala_runtime_Statics {
+
+    @Substitute
+    public static void releaseFence() {
+        UnsafeUtils.UNSAFE.storeFence();
+    }
+}

src/main/java/scala/meta/internal/svm_subs/UnsafeUtils.java

@@ -0,0 +1,16 @@
+package scala.meta.internal.svm_subs;
+
+import java.lang.reflect.Field;
+
+class UnsafeUtils {
+    static final sun.misc.Unsafe UNSAFE;
+    static {
+        try {
+            Field field = sun.misc.Unsafe.class.getDeclaredField("theUnsafe");
+            field.setAccessible(true);
+            UNSAFE = (sun.misc.Unsafe) field.get(null);
+        } catch (Throwable ex) {
+            throw new ExceptionInInitializerError(ex);
+        }
+    }
+}

src/main/resources/graal/jni-config.json

@@ -1,13 +1,7 @@
 [
 {
   "name":"java.lang.ClassLoader",
-  "methods":[
-    {"name":"getPlatformClassLoader","parameterTypes":[] }, 
-    {"name":"loadClass","parameterTypes":["java.lang.String"] }
-  ]
-},
-{
-  "name":"java.lang.ClassNotFoundException"
+  "methods":[{"name":"getPlatformClassLoader","parameterTypes":[] }]
 },
 {
   "name":"java.lang.NoSuchMethodError"

src/main/resources/graal/reflect-config.json

@@ -117,7 +117,8 @@
   "name":"java.lang.String[]"
 },
 {
-  "name":"java.lang.invoke.VarHandle"
+  "name":"java.lang.invoke.VarHandle",
+  "methods":[{"name":"releaseFence","parameterTypes":[] }]
 },
 {
   "name":"java.net.NetPermission"
@@ -160,7 +161,8 @@
   "name":"org.postgresql.Driver"
 },
 {
-  "name":"scala.Symbol"
+  "name":"scala.Symbol",
+  "methods":[{"name":"apply","parameterTypes":["java.lang.String"] }]
 },
 {
   "name":"scala.util.Either[]"

src/main/resources/graal/resource-config.json

@@ -1,9 +1,10 @@
 {
-  "resources":[
+  "resources":{
+  "includes":[
     {"pattern":"\\Qapplication.conf\\E"}, 
     {"pattern":"\\Qlogback.xml\\E"}, 
     {"pattern":"\\Qorg/slf4j/impl/StaticLoggerBinder.class\\E"}, 
     {"pattern":"\\Qreference.conf\\E"}
-  ],
+  ]},
   "bundles":[]
 }

src/main/resources/graal/serialization-config.json

@@ -0,0 +1,2 @@
+[
+]