Merge pull request #22928 from stuartwdouglas/21250

Use new loadClassFromTCCL method
quarkusio · Jan 26, 2022 · 125879f · 125879f
2 parents 18ad788 + d6e95a7
commit 125879f
Show file tree

Hide file tree

Showing 47 changed files with 181 additions and 163 deletions.
diff --git a/...ment/src/main/java/io/quarkus/deployment/configuration/RunTimeConfigurationGenerator.java b/...ment/src/main/java/io/quarkus/deployment/configuration/RunTimeConfigurationGenerator.java
@@ -648,7 +648,7 @@ public void run() {
                 FieldDescriptor fd = convertersByType.get(type);
                 if (fd == null) {
                     // it's an unknown
-                    final ResultHandle clazzHandle = converterSetup.loadClass(additionalType);
+                    final ResultHandle clazzHandle = converterSetup.loadClassFromTCCL(additionalType);
                     fd = FieldDescriptor.of(cc.getClassName(), "conv$" + converterIndex++, Converter.class);
                     ResultHandle converter = converterSetup.invokeVirtualMethod(SRC_GET_CONVERTER, clinitConfig, clazzHandle);
                     cc.getFieldCreator(fd).setModifiers(Opcodes.ACC_STATIC | Opcodes.ACC_FINAL);
@@ -664,10 +664,10 @@ public void run() {
                     final Class<?> type = entry.getValue();
                     if (bootstrapConfigSetupNeeded()) {
                         readBootstrapConfig.invokeVirtualMethod(SRCB_WITH_CONVERTER, bootstrapBuilder,
-                                readBootstrapConfig.loadClass(type),
+                                readBootstrapConfig.loadClassFromTCCL(type),
                                 readBootstrapConfig.load(100), readBootstrapConfig.readStaticField(descriptor));
                     }
-                    readConfig.invokeVirtualMethod(SRCB_WITH_CONVERTER, runTimeBuilder, readConfig.loadClass(type),
+                    readConfig.invokeVirtualMethod(SRCB_WITH_CONVERTER, runTimeBuilder, readConfig.loadClassFromTCCL(type),
                             readConfig.load(100), readConfig.readStaticField(descriptor));
                 }
             }
@@ -1596,12 +1596,12 @@ private FieldDescriptor getOrCreateConverterInstance(Field field, ConverterType
                     // TODO: temporary until type param inference is in
                     if (convertWith == HyphenateEnumConverter.class.asSubclass(Converter.class)) {
                         converter = converterSetup.newInstance(MethodDescriptor.ofConstructor(convertWith, Class.class),
-                                converterSetup.loadClass(type.getLeafType()));
+                                converterSetup.loadClassFromTCCL(type.getLeafType()));
                     } else {
                         converter = converterSetup.newInstance(MethodDescriptor.ofConstructor(convertWith));
                     }
                 } else {
-                    final ResultHandle clazzHandle = converterSetup.loadClass(leaf.getLeafType());
+                    final ResultHandle clazzHandle = converterSetup.loadClassFromTCCL(leaf.getLeafType());
                     converter = converterSetup.invokeVirtualMethod(SRC_GET_CONVERTER, clinitConfig, clazzHandle);
                     storeConverter = true;
                 }
@@ -1610,7 +1610,7 @@ private FieldDescriptor getOrCreateConverterInstance(Field field, ConverterType
                 final ResultHandle nestedConv = instanceCache
                         .get(getOrCreateConverterInstance(field, arrayOf.getElementType()));
                 converter = converterSetup.invokeStaticMethod(CONVS_NEW_ARRAY_CONVERTER, nestedConv,
-                        converterSetup.loadClass(arrayOf.getArrayType()));
+                        converterSetup.loadClassFromTCCL(arrayOf.getArrayType()));
             } else if (type instanceof CollectionOf) {
                 final CollectionOf collectionOf = (CollectionOf) type;
                 final ResultHandle nestedConv = instanceCache

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/RuntimeUpdatesProcessor.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/RuntimeUpdatesProcessor.java
@@ -472,7 +472,8 @@ public boolean doScan(boolean userInitiated, boolean forceRestart) {
                         for (Path i : changedClassResults.changedClasses) {
                             byte[] bytes = Files.readAllBytes(i);
                             String name = indexer.index(new ByteArrayInputStream(bytes)).name().toString();
-                            defs[index++] = new ClassDefinition(Thread.currentThread().getContextClassLoader().loadClass(name),
+                            defs[index++] = new ClassDefinition(
+                                    Thread.currentThread().getContextClassLoader().loadClass(name),
                                     classTransformers.apply(name, bytes));
                         }
                         Index current = indexer.complete();

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/proxy/ProxyFactory.java b/core/deployment/src/main/java/io/quarkus/deployment/proxy/ProxyFactory.java
@@ -220,14 +220,14 @@ private void doDefineClass() {
                     if (methodInfo.getParameterCount() > 0) {
                         Parameter[] methodInfoParameters = methodInfo.getParameters();
                         for (int i = 0; i < methodInfo.getParameterCount(); i++) {
-                            ResultHandle paramClass = mc.loadClass(methodInfoParameters[i].getType());
+                            ResultHandle paramClass = mc.loadClassFromTCCL(methodInfoParameters[i].getType());
                             mc.writeArrayValue(getDeclaredMethodParamsArray, i, paramClass);
                         }
                     }
                     ResultHandle method = mc.invokeVirtualMethod(
                             MethodDescriptor.ofMethod(Class.class, "getDeclaredMethod", Method.class, String.class,
                                     Class[].class),
-                            mc.loadClass(methodInfo.getDeclaringClass()), mc.load(methodInfo.getName()),
+                            mc.loadClassFromTCCL(methodInfo.getDeclaringClass()), mc.load(methodInfo.getName()),
                             getDeclaredMethodParamsArray);
 
                     // result = invocationHandler.invoke(...)

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java b/core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java
@@ -789,7 +789,7 @@ ResultHandle doLoad(MethodContext context, MethodCreator method, ResultHandle ar
                 return new DeferredParameter() {
                     @Override
                     ResultHandle doLoad(MethodContext context, MethodCreator method, ResultHandle array) {
-                        return method.loadClass((Class) param);
+                        return method.loadClassFromTCCL((Class) param);
                     }
                 };
             }
@@ -1766,7 +1766,7 @@ ResultHandle doLoad(MethodContext context, MethodCreator valueMethod, ResultHand
                         retValue = valueMethod.load(value.asChar());
                         break;
                     case CLASS:
-                        retValue = valueMethod.loadClass(value.asClass().toString());
+                        retValue = valueMethod.loadClassFromTCCL(value.asClass().toString());
                         break;
                     case ARRAY:
                         retValue = arrayValue(value, valueMethod, method, annotationClass);
@@ -1793,7 +1793,7 @@ static ResultHandle arrayValue(AnnotationValue value, BytecodeCreator valueMetho
                 Type[] classArray = value.asClassArray();
                 retValue = valueMethod.newArray(componentType(method), valueMethod.load(classArray.length));
                 for (int i = 0; i < classArray.length; i++) {
-                    valueMethod.writeArrayValue(retValue, i, valueMethod.loadClass(classArray[i].name().toString()));
+                    valueMethod.writeArrayValue(retValue, i, valueMethod.loadClassFromTCCL(classArray[i].name().toString()));
                 }
                 break;
             case STRING:

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/MainClassBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/MainClassBuildStep.java
@@ -414,7 +414,7 @@ private void generateMainForQuarkusApplication(String quarkusApplicationClassNam
         MethodCreator mv = file.getMethodCreator("main", void.class, String[].class);
         mv.setModifiers(Modifier.PUBLIC | Modifier.STATIC);
         mv.invokeStaticMethod(MethodDescriptor.ofMethod(Quarkus.class, "run", void.class, Class.class, String[].class),
-                mv.loadClass(quarkusApplicationClassName),
+                mv.loadClassFromTCCL(quarkusApplicationClassName),
                 mv.getMethodParam(0));
         mv.returnValue(null);
         file.close();