Refactor: Reduce code duplication in runtime(re)initialization

Author: zakkak

core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageFeatureStep.java

@@ -112,7 +112,7 @@ public void write(String s, byte[] bytes) {
             }
         }
 
-        if (!runtimeInitializedClassBuildItems.isEmpty()) {
+        if (!runtimeInitializedClassBuildItems.isEmpty() || !runtimeReinitializedClassBuildItems.isEmpty()) {
             //  Class[] runtimeInitializedClasses()
             MethodCreator runtimeInitializedClasses = file
                     .getMethodCreator("runtimeInitializedClasses", Class[].class)
@@ -123,7 +123,8 @@ public void write(String s, byte[] bytes) {
                     ofMethod(Class.class, "getClassLoader", ClassLoader.class),
                     thisClass);
             ResultHandle classesArray = runtimeInitializedClasses.newArray(Class.class,
-                    runtimeInitializedClasses.load(runtimeInitializedClassBuildItems.size()));
+                    runtimeInitializedClasses
+                            .load(runtimeInitializedClassBuildItems.size() + runtimeReinitializedClassBuildItems.size()));
             for (int i = 0; i < runtimeInitializedClassBuildItems.size(); i++) {
                 TryBlock tc = runtimeInitializedClasses.tryBlock();
                 ResultHandle clazz = tc.invokeStaticMethod(
@@ -133,6 +134,15 @@ public void write(String s, byte[] bytes) {
                 CatchBlockCreator cc = tc.addCatch(Throwable.class);
                 cc.invokeVirtualMethod(ofMethod(Throwable.class, "printStackTrace", void.class), cc.getCaughtException());
             }
+            for (int i = 0; i < runtimeReinitializedClassBuildItems.size(); i++) {
+                TryBlock tc = runtimeInitializedClasses.tryBlock();
+                ResultHandle clazz = tc.invokeStaticMethod(
+                        ofMethod(Class.class, "forName", Class.class, String.class, boolean.class, ClassLoader.class),
+                        tc.load(runtimeReinitializedClassBuildItems.get(i).getClassName()), tc.load(false), cl);
+                tc.writeArrayValue(classesArray, i, clazz);
+                CatchBlockCreator cc = tc.addCatch(Throwable.class);
+                cc.invokeVirtualMethod(ofMethod(Throwable.class, "printStackTrace", void.class), cc.getCaughtException());
+            }
             runtimeInitializedClasses.returnValue(classesArray);
 
             ResultHandle classes = overallCatch.invokeStaticMethod(runtimeInitializedClasses.getMethodDescriptor());
@@ -160,33 +170,6 @@ public void write(String s, byte[] bytes) {
             overallCatch.invokeStaticMethod(INITIALIZE_PACKAGES_AT_RUN_TIME, packages);
         }
 
-        // hack in reinitialization of process info classes
-        if (!runtimeReinitializedClassBuildItems.isEmpty()) {
-            MethodCreator runtimeReinitializedClasses = file
-                    .getMethodCreator("runtimeReinitializedClasses", Class[].class)
-                    .setModifiers(Modifier.PRIVATE | Modifier.STATIC);
-
-            ResultHandle thisClass = runtimeReinitializedClasses.loadClassFromTCCL(GRAAL_FEATURE);
-            ResultHandle cl = runtimeReinitializedClasses.invokeVirtualMethod(
-                    ofMethod(Class.class, "getClassLoader", ClassLoader.class),
-                    thisClass);
-            ResultHandle classesArray = runtimeReinitializedClasses.newArray(Class.class,
-                    runtimeReinitializedClasses.load(runtimeReinitializedClassBuildItems.size()));
-            for (int i = 0; i < runtimeReinitializedClassBuildItems.size(); i++) {
-                TryBlock tc = runtimeReinitializedClasses.tryBlock();
-                ResultHandle clazz = tc.invokeStaticMethod(
-                        ofMethod(Class.class, "forName", Class.class, String.class, boolean.class, ClassLoader.class),
-                        tc.load(runtimeReinitializedClassBuildItems.get(i).getClassName()), tc.load(false), cl);
-                tc.writeArrayValue(classesArray, i, clazz);
-                CatchBlockCreator cc = tc.addCatch(Throwable.class);
-                cc.invokeVirtualMethod(ofMethod(Throwable.class, "printStackTrace", void.class), cc.getCaughtException());
-            }
-            runtimeReinitializedClasses.returnValue(classesArray);
-
-            ResultHandle classes = overallCatch.invokeStaticMethod(runtimeReinitializedClasses.getMethodDescriptor());
-            overallCatch.invokeStaticMethod(INITIALIZE_CLASSES_AT_RUN_TIME, classes);
-        }
-
         // Ensure registration of fields being accessed through unsafe is done last to ensure that the class
         // initialization configuration is done first.  Registering the fields before configuring class initialization
         // may results in classes being marked for runtime initialization even if not explicitly requested.