Cache conversion factories

Author: otethal

graalpython/com.oracle.graal.python.processor/src/com/oracle/graal/python/processor/ArgumentClinicProcessor.java

@@ -63,14 +63,12 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.ExecutableElement;
-import javax.lang.model.element.Modifier;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.TypeMirror;
 import javax.tools.Diagnostic.Kind;
 import javax.tools.JavaFileObject;
 
 import com.oracle.graal.python.annotations.ArgumentClinic;
-import com.oracle.graal.python.annotations.ArgumentClinic.ConversionFactory;
 import com.oracle.graal.python.annotations.ArgumentClinic.PrimitiveType;
 import com.oracle.graal.python.annotations.ArgumentsClinic;
 import com.oracle.graal.python.processor.ArgumentClinicModel.ArgumentClinicData;
@@ -285,32 +283,12 @@ private Map<String, ConverterFactory> getConverterFactories(TypeElement type) th
             AnnotationValue v = findAnnotationValue(m, "conversionClass");
             if (v != null) {
                 TypeElement conversionClass = (TypeElement) processingEnv.getTypeUtils().asElement((TypeMirror) v.getValue());
-                converterFactories.put(name, createConverterFactory(conversionClass));
+                converterFactories.put(name, ConverterFactory.getForClass(conversionClass));
             }
         }
         return converterFactories;
     }
 
-    private ConverterFactory createConverterFactory(TypeElement conversionClass) throws ProcessingError {
-        ConverterFactory factory = null;
-        for (Element e : conversionClass.getEnclosedElements()) {
-            ConversionFactory annot = e.getAnnotation(ConversionFactory.class);
-            if (annot != null) {
-                if (!e.getModifiers().contains(Modifier.STATIC) || e.getKind() != ElementKind.METHOD) {
-                    throw error(conversionClass, "ConversionFactory annotation is applicable only to static methods.");
-                }
-                if (factory != null) {
-                    throw error(conversionClass, "Multiple ConversionFactory annotations in a single class.");
-                }
-                factory = new ConverterFactory((ExecutableElement) e, annot.clinicArgs());
-            }
-        }
-        if (factory == null) {
-            throw error(conversionClass, "No ConversionFactory annotation found.");
-        }
-        return factory;
-    }
-
     private static AnnotationMirror findAnnotationMirror(TypeElement type, String annotationQualifiedName) {
         for (AnnotationMirror annot : type.getAnnotationMirrors()) {
             String name = ((TypeElement) annot.getAnnotationType().asElement()).getQualifiedName().toString();

graalpython/com.oracle.graal.python.processor/src/com/oracle/graal/python/processor/ConverterFactory.java

@@ -44,19 +44,27 @@
 import com.oracle.graal.python.annotations.ArgumentClinic.PrimitiveType;
 import com.oracle.graal.python.annotations.ArgumentClinic.ConversionFactory.ClinicArgument;
 
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.TypeElement;
+import java.util.HashMap;
+import java.util.Map;
 
 public class ConverterFactory {
     public static final String CLINIC_PACKAGE = "com.oracle.graal.python.nodes.function.builtins.clinic";
 
+    private static final Map<TypeElement, ConverterFactory> cache = new HashMap<>();
+
     public final String fullClassName;
     public final String className;
     public final String methodName;
     public final int paramCount;
     public final ClinicArgument[] clinicArgs;
     public final PrimitiveType[] acceptedPrimitiveTypes;
 
-    public ConverterFactory(ExecutableElement method, ClinicArgument[] clinicArgs) {
+    private ConverterFactory(ExecutableElement method, ClinicArgument[] clinicArgs) {
         fullClassName = method.getEnclosingElement().toString();
         className = fullClassName.substring(fullClassName.lastIndexOf('.') + 1);
         methodName = method.getSimpleName().toString();
@@ -127,4 +135,29 @@ public static ConverterFactory getBuiltin(ArgumentClinic annotation) {
                 throw new IllegalArgumentException(annotation.conversion().toString());
         }
     }
+
+    public static ConverterFactory getForClass(TypeElement conversionClass) throws ProcessingError {
+        ConverterFactory factory = cache.get(conversionClass);
+        if (factory != null) {
+            return factory;
+        }
+        for (Element e : conversionClass.getEnclosedElements()) {
+            ArgumentClinic.ConversionFactory annot = e.getAnnotation(ArgumentClinic.ConversionFactory.class);
+            if (annot != null) {
+                if (!e.getModifiers().contains(Modifier.STATIC) || e.getKind() != ElementKind.METHOD) {
+                    throw new ProcessingError(conversionClass, "ConversionFactory annotation is applicable only to static methods.");
+                }
+                if (factory != null) {
+                    throw new ProcessingError(conversionClass, "Multiple ConversionFactory annotations in a single class.");
+                }
+                factory = new ConverterFactory((ExecutableElement) e, annot.clinicArgs());
+            }
+        }
+        if (factory == null) {
+            throw new ProcessingError(conversionClass, "No ConversionFactory annotation found.");
+        }
+        cache.put(conversionClass, factory);
+        return factory;
+    }
+
 }