Avoid library factory runtime annotation lookup of during initialization.

Author: chumer

truffle/src/com.oracle.truffle.api.library/snapshot.sigtest

@@ -124,6 +124,8 @@ meth public abstract java.lang.Object readDelegateExport(java.lang.Object)
 
 CLSS public abstract com.oracle.truffle.api.library.LibraryFactory<%0 extends com.oracle.truffle.api.library.Library>
 cons protected init(java.lang.Class<{com.oracle.truffle.api.library.LibraryFactory%0}>,java.util.List<com.oracle.truffle.api.library.Message>)
+ anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="26.0")
+cons protected init(java.lang.Class<{com.oracle.truffle.api.library.LibraryFactory%0}>,java.util.List<com.oracle.truffle.api.library.Message>,boolean)
 meth protected !varargs com.oracle.truffle.api.utilities.FinalBitSet createMessageBitSet(com.oracle.truffle.api.library.Message[])
 meth protected abstract java.lang.Class<?> getDefaultClass(java.lang.Object)
 meth protected abstract java.lang.Object genericDispatch(com.oracle.truffle.api.library.Library,java.lang.Object,com.oracle.truffle.api.library.Message,java.lang.Object[],int) throws java.lang.Exception
@@ -155,12 +157,10 @@ CLSS public abstract com.oracle.truffle.api.library.Message
 cons protected !varargs init(java.lang.Class<? extends com.oracle.truffle.api.library.Library>,java.lang.String,int,boolean,java.lang.Class<?>,java.lang.Class<?>[])
 cons protected !varargs init(java.lang.Class<? extends com.oracle.truffle.api.library.Library>,java.lang.String,int,java.lang.Class<?>,java.lang.Class<?>[])
 meth protected final java.lang.Object clone() throws java.lang.CloneNotSupportedException
-meth public final boolean equals(java.lang.Object)
 meth public final boolean isDeprecated()
 meth public final com.oracle.truffle.api.library.LibraryFactory<?> getFactory()
 meth public final int getId()
 meth public final int getParameterCount()
-meth public final int hashCode()
 meth public final java.lang.Class<? extends com.oracle.truffle.api.library.Library> getLibraryClass()
 meth public final java.lang.Class<?> getParameterType(int)
 meth public final java.lang.Class<?> getReceiverType()
@@ -173,7 +173,7 @@ meth public final java.util.List<java.lang.Class<?>> getParameterTypes()
 meth public static com.oracle.truffle.api.library.Message resolve(java.lang.Class<? extends com.oracle.truffle.api.library.Library>,java.lang.String)
 meth public static com.oracle.truffle.api.library.Message resolve(java.lang.Class<? extends com.oracle.truffle.api.library.Library>,java.lang.String,boolean)
 supr java.lang.Object
-hfds deprecated,hash,id,library,libraryClass,parameterCount,parameterTypes,parameterTypesArray,qualifiedName,returnType,simpleName
+hfds deprecated,id,library,libraryClass,parameterCount,parameterTypesArray,qualifiedName,returnType,simpleName
 
 CLSS public abstract com.oracle.truffle.api.library.ReflectionLibrary
 cons protected init()
@@ -282,3 +282,8 @@ CLSS public abstract interface !annotation java.lang.annotation.Target
 intf java.lang.annotation.Annotation
 meth public abstract java.lang.annotation.ElementType[] value()
 
+CLSS public abstract interface !annotation jdk.internal.vm.annotation.AOTSafeClassInitializer
+ anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
+ anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[TYPE])
+intf java.lang.annotation.Annotation
+

truffle/src/com.oracle.truffle.api.library/src/com/oracle/truffle/api/library/LibraryFactory.java

@@ -171,7 +171,7 @@ private static void removeClassesLoadedDuringImageBuild(Map<? extends Class<?>,
     final Map<String, Message> nameToMessages;
     @CompilationFinal private volatile T uncachedDispatch;
 
-    final DynamicDispatchLibrary dispatchLibrary;
+    private final DynamicDispatchLibrary dispatchLibrary;
 
     DefaultExportProvider[] beforeBuiltinDefaultExports;
     DefaultExportProvider[] afterBuiltinDefaultExports;
@@ -180,9 +180,35 @@ private static void removeClassesLoadedDuringImageBuild(Map<? extends Class<?>,
      * Constructor for generated subclasses. Do not sub-class {@link LibraryFactory} manually.
      *
      * @since 19.0
+     * @deprecated new versions of the library generator won't use this constructor anymore
      */
     @SuppressWarnings("unchecked")
+    @Deprecated
     protected LibraryFactory(Class<T> libraryClass, List<Message> messages) {
+        this(libraryClass, messages, isDynamicDispatchEnabled(libraryClass));
+    }
+
+    private static boolean isDynamicDispatchEnabled(Class<?> libraryClass) {
+        if (libraryClass == DynamicDispatchLibrary.class) {
+            return false;
+        } else {
+            GenerateLibrary annotation = libraryClass.getAnnotation(GenerateLibrary.class);
+            boolean dynamicDispatchEnabled = annotation == null || annotation.dynamicDispatchEnabled();
+            if (dynamicDispatchEnabled) {
+                return true;
+            } else {
+                return false;
+            }
+        }
+    }
+
+    /**
+     * Constructor for generated subclasses. Do not sub-class {@link LibraryFactory} manually.
+     *
+     * @since 26.0
+     */
+    @SuppressWarnings("unchecked")
+    protected LibraryFactory(Class<T> libraryClass, List<Message> messages, boolean dynamicDispatchEnabled) {
         assert this.getClass().getName().endsWith(LibraryExport.GENERATED_CLASS_SUFFIX);
         this.libraryClass = libraryClass;
         this.messages = Collections.unmodifiableList(messages);
@@ -193,18 +219,7 @@ protected LibraryFactory(Class<T> libraryClass, List<Message> messages) {
             messagesMap.putIfAbsent(message.getSimpleName(), message);
         }
         this.nameToMessages = messagesMap;
-        if (libraryClass == DynamicDispatchLibrary.class) {
-            this.dispatchLibrary = null;
-        } else {
-            GenerateLibrary annotation = libraryClass.getAnnotation(GenerateLibrary.class);
-            boolean dynamicDispatchEnabled = annotation == null || libraryClass.getAnnotation(GenerateLibrary.class).dynamicDispatchEnabled();
-            if (dynamicDispatchEnabled) {
-                this.dispatchLibrary = LibraryFactory.resolve(DynamicDispatchLibrary.class).getUncached();
-            } else {
-                this.dispatchLibrary = null;
-            }
-        }
-
+        this.dispatchLibrary = dynamicDispatchEnabled ? LibraryFactory.resolve(DynamicDispatchLibrary.class).getUncached() : null;
         initDefaultExports();
     }
 

truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/library/LibraryGenerator.java

@@ -757,6 +757,9 @@ public List<CodeTypeElement> create(ProcessorContext context1, AnnotationProcess
             }
         }
         builder.end(); // of
+
+        builder.string(String.valueOf(!model.isDynamicDispatch() && model.isDynamicDispatchEnabled()));
+
         builder.end(); // superCall
         builder.end(); // statement