Fix native compilation for Netty and Mutiny

See quarkusio#39819 and quarkusio#39788
gsmet · Apr 2, 2024 · b35ae00 · b35ae00
1 parent 9ca43be
commit b35ae00
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 11 deletions.
diff --git a/extensions/mutiny/deployment/src/main/java/io/quarkus/mutiny/deployment/MutinyProcessor.java b/extensions/mutiny/deployment/src/main/java/io/quarkus/mutiny/deployment/MutinyProcessor.java
@@ -1,6 +1,5 @@
 package io.quarkus.mutiny.deployment;
 
-import java.util.List;
 import java.util.Optional;
 
 import org.jboss.threads.ContextHandler;
@@ -11,7 +10,6 @@
 import io.quarkus.deployment.builditem.ContextHandlerBuildItem;
 import io.quarkus.deployment.builditem.ExecutorBuildItem;
 import io.quarkus.deployment.builditem.ShutdownContextBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.UnsafeAccessedFieldBuildItem;
 import io.quarkus.mutiny.runtime.MutinyInfrastructure;
 
 public class MutinyProcessor {
@@ -33,12 +31,4 @@ public void buildTimeInit(MutinyInfrastructure recorder) {
         recorder.configureThreadBlockingChecker();
         recorder.configureOperatorLogger();
     }
-
-    @BuildStep
-    public List<UnsafeAccessedFieldBuildItem> jctoolsUnsafeAccessedFields() {
-        return List.of(
-                new UnsafeAccessedFieldBuildItem(
-                        "org.jctools.util.UnsafeRefArrayAccess",
-                        "REF_ELEMENT_SHIFT"));
-    }
 }
diff --git a/extensions/mutiny/runtime/pom.xml b/extensions/mutiny/runtime/pom.xml
@@ -31,12 +31,17 @@
             <groupId>io.smallrye.reactive</groupId>
             <artifactId>mutiny-smallrye-context-propagation</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.graalvm.sdk</groupId>
+            <artifactId>nativeimage</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-junit5-internal</artifactId>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>

diff --git a/extensions/mutiny/runtime/src/main/java/io/quarkus/mutiny/runtime/JCToolsSupport.java b/extensions/mutiny/runtime/src/main/java/io/quarkus/mutiny/runtime/JCToolsSupport.java
@@ -0,0 +1,17 @@
+package io.quarkus.mutiny.runtime;
+
+import com.oracle.svm.core.annotate.Alias;
+import com.oracle.svm.core.annotate.RecomputeFieldValue;
+import com.oracle.svm.core.annotate.TargetClass;
+
+class JCToolsSupport {
+}
+
+// Thanks to https://github.com/DataDog/dd-trace-java/pull/6020
+@TargetClass(className = "org.jctools.util.UnsafeRefArrayAccess")
+final class Target_org_jctools_util_UnsafeRefArrayAccess {
+
+    @Alias
+    @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.ArrayIndexShift, declClass = Object[].class)
+    public static int REF_ELEMENT_SHIFT;
+}
diff --git a/extensions/netty/deployment/src/main/java/io/quarkus/netty/deployment/NettyProcessor.java b/extensions/netty/deployment/src/main/java/io/quarkus/netty/deployment/NettyProcessor.java
@@ -105,6 +105,8 @@ NativeImageConfigBuildItem build(
                 .addRuntimeInitializedClass("io.netty.handler.ssl.ReferenceCountedOpenSslEngine")
                 .addRuntimeInitializedClass("io.netty.handler.ssl.ReferenceCountedOpenSslContext")
                 .addRuntimeInitializedClass("io.netty.handler.ssl.ReferenceCountedOpenSslClientContext")
+                .addRuntimeInitializedClass("io.netty.handler.ssl.JdkSslServerContext")
+                .addRuntimeInitializedClass("io.netty.handler.ssl.JdkSslClientContext")
                 .addRuntimeInitializedClass("io.netty.handler.ssl.util.ThreadLocalInsecureRandom")
                 .addRuntimeInitializedClass("io.netty.buffer.ByteBufUtil$HexUtil")
                 .addRuntimeInitializedClass("io.netty.buffer.PooledByteBufAllocator")