Merge pull request #32653 from mkouba/qute-assignability-perf-imp

Qute build steps - refactoring and performance improvements
quarkusio · Apr 16, 2023 · f85e7d4 · f85e7d4
2 parents 8e81b1e + 4d3a543
commit f85e7d4
Show file tree

Hide file tree

Showing 4 changed files with 170 additions and 185 deletions.
diff --git a/...ions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleProcessor.java b/...ions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleProcessor.java
@@ -88,8 +88,7 @@
 import io.quarkus.qute.deployment.QuteProcessor.JavaMemberLookupConfig;
 import io.quarkus.qute.deployment.QuteProcessor.MatchResult;
 import io.quarkus.qute.deployment.TemplatesAnalysisBuildItem.TemplateAnalysis;
-import io.quarkus.qute.deployment.Types.AssignableInfo;
-import io.quarkus.qute.deployment.Types.HierarchyIndexer;
+import io.quarkus.qute.deployment.Types.AssignabilityCheck;
 import io.quarkus.qute.generator.Descriptors;
 import io.quarkus.qute.generator.ValueResolverGenerator;
 import io.quarkus.qute.i18n.Localized;
@@ -455,8 +454,7 @@ public String apply(String id) {
 
         JavaMemberLookupConfig lookupConfig = new QuteProcessor.FixedJavaMemberLookupConfig(index,
                 QuteProcessor.initDefaultMembersFilter(), false);
-        Map<DotName, AssignableInfo> assignableCache = new HashMap<>();
-        HierarchyIndexer hierarchyIndexer = new HierarchyIndexer(index);
+        AssignabilityCheck assignabilityCheck = new AssignabilityCheck(index);
 
         // bundle name -> (key -> method)
         Map<String, Map<String, MethodInfo>> bundleToMethods = new HashMap<>();
@@ -576,10 +574,10 @@ public String apply(String id) {
                                             implicitClassToMembersUsed, templateIdToPathFun, generatedIdsToMatches,
                                             extensionMethodExcludes, checkedTemplate, lookupConfig, namedBeans,
                                             namespaceTemplateData, regularExtensionMethods, namespaceExtensionMethods,
-                                            assignableCache, hierarchyIndexer);
+                                            assignabilityCheck);
                                     MatchResult match = results.get(param.toOriginalString());
-                                    if (match != null && !match.isEmpty() && !Types.isAssignableFrom(match.type(),
-                                            methodParams.get(idx), index, assignableCache)) {
+                                    if (match != null && !match.isEmpty() && !assignabilityCheck.isAssignableFrom(match.type(),
+                                            methodParams.get(idx))) {
                                         incorrectExpressions
                                                 .produce(new IncorrectExpressionBuildItem(expression.toOriginalString(),
                                                         "Message bundle method " + method.declaringClass().name() + "#" +