Merge pull request quarkusio#26856 from zakkak/fix-oracle-4736

Fix generated getRequiredFeatures method for 22.3-dev
geoand · Jul 25, 2022 · 11866ad · 11866ad
2 parents 53ac56c + af1770a
commit 11866ad
Showing 1 changed file with 24 additions and 5 deletions.
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageFeatureStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageFeatureStep.java
@@ -43,6 +43,8 @@
 import io.quarkus.deployment.builditem.nativeimage.UnsafeAccessedFieldBuildItem;
 import io.quarkus.deployment.pkg.steps.GraalVM;
 import io.quarkus.gizmo.AssignableResultHandle;
+import io.quarkus.gizmo.BranchResult;
+import io.quarkus.gizmo.BytecodeCreator;
 import io.quarkus.gizmo.CatchBlockCreator;
 import io.quarkus.gizmo.ClassCreator;
 import io.quarkus.gizmo.ClassOutput;
@@ -586,15 +588,32 @@ private MethodDescriptor createRegisterSerializationForClassMethod(ClassCreator
         //register serialization feature as requested
         MethodCreator requiredFeatures = file.getMethodCreator("getRequiredFeatures", "java.util.List");
 
-        TryBlock requiredCatch = requiredFeatures.tryBlock();
+        TryBlock requiredTryCatch = requiredFeatures.tryBlock();
 
-        ResultHandle serializationFeatureClass = requiredCatch
-                .loadClassFromTCCL("com.oracle.svm.reflect.serialize.hosted.SerializationFeature");
-        ResultHandle requiredFeaturesList = requiredCatch.invokeStaticMethod(
+        AssignableResultHandle serializationFeatureClass = requiredTryCatch.createVariable(Class.class);
+
+        BranchResult graalVm22_3Test = requiredTryCatch.ifGreaterEqualZero(
+                requiredTryCatch.invokeVirtualMethod(VERSION_COMPARE_TO,
+                        requiredTryCatch.invokeStaticMethod(VERSION_CURRENT),
+                        requiredTryCatch.marshalAsArray(int.class, requiredTryCatch.load(22), requiredTryCatch.load(3))));
+        /* GraalVM >= 22.3 */
+        BytecodeCreator greaterThan22_2 = graalVm22_3Test.trueBranch();
+        greaterThan22_2.assign(serializationFeatureClass,
+                greaterThan22_2.loadClassFromTCCL("com.oracle.svm.hosted.reflect.serialize.SerializationFeature"));
+        /* GraalVM < 22.3 */
+        BytecodeCreator smallerThan22_3 = graalVm22_3Test.falseBranch();
+        smallerThan22_3.assign(serializationFeatureClass,
+                smallerThan22_3.loadClassFromTCCL("com.oracle.svm.reflect.serialize.hosted.SerializationFeature"));
+
+        ResultHandle requiredFeaturesList = requiredTryCatch.invokeStaticMethod(
                 ofMethod("java.util.Collections", "singletonList", List.class, Object.class),
                 serializationFeatureClass);
 
-        requiredCatch.returnValue(requiredFeaturesList);
+        requiredTryCatch.returnValue(requiredFeaturesList);
+
+        CatchBlockCreator cc = requiredTryCatch.addCatch(Throwable.class);
+        cc.invokeVirtualMethod(ofMethod(Throwable.class, "printStackTrace", void.class), cc.getCaughtException());
+        cc.throwException(cc.getCaughtException());
 
         // method to register class for registration
         MethodCreator addSerializationForClass = file.getMethodCreator("registerSerializationForClass", "V", Class.class);