Automatic merge of master into galahad

oracle · Nov 6, 2024 · 3beb323 · 3beb323
2 parents c87a855 + 47a7322
commit 3beb323
Show file tree

Hide file tree

Showing 17 changed files with 38 additions and 566 deletions.
diff --git a/ci_includes/publish-javadoc.jsonnet b/ci_includes/publish-javadoc.jsonnet
@@ -20,7 +20,7 @@
       ["zip", "-r", "javadoc.zip", "javadoc"],
       ["cd", "../compiler"],
       ["mx", "build"],
-      ["mx", "javadoc", "--projects", "jdk.graal.compiler", "--packages", "jdk.graal.compiler.graphio,org.graalvm.word,org.graalvm.collections,com.oracle.truffle.compiler"],
+      ["mx", "javadoc", "--projects", "jdk.graal.compiler", "--packages", "jdk.graal.compiler.graphio,org.graalvm.word,org.graalvm.collections,com.oracle.truffle.compiler,org.graalvm.nativeimage,com.oracle.svm.core.annotate"],
       ["cd", "src/jdk.graal.compiler/"],
       ["zip", "-r", "../../graphio-javadoc.zip", "javadoc"],
       ["cd", "../../.."],

diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py
@@ -1826,14 +1826,6 @@
                     "org.graalvm.polyglot",
                     "org.graalvm.truffle.compiler",
                 ],
-                "uses" : [
-                    "com.oracle.truffle.api.TruffleLanguage.Provider",
-                    "com.oracle.truffle.api.instrumentation.TruffleInstrument.Provider",
-                    "com.oracle.truffle.api.provider.TruffleLanguageProvider",
-                    "com.oracle.truffle.api.instrumentation.provider.TruffleInstrumentProvider",
-                    "com.oracle.truffle.api.TruffleLanguage.Provider",                   # Deprecated
-                    "com.oracle.truffle.api.instrumentation.TruffleInstrument.Provider", # Deprecated
-                ],
                 "requiresConcealed": {
                     "jdk.internal.vm.ci": [
                         "jdk.vm.ci.common",

diff --git a/truffle/CHANGELOG.md b/truffle/CHANGELOG.md
@@ -10,6 +10,8 @@ This changelog summarizes major changes between Truffle versions relevant to lan
 * GR-57550 Added support for long-width dispatch targets to Bytecode OSR.
 * PR-8266  Allow control of `throwDeniedThreadAccess` via `TruffleContext.threadAccessDeniedHandler`
 * GR-57817 Java Native access for [JEP-472](https://openjdk.org/jeps/472) is now automatically provided for all languages and tools by Truffle. For more information, refer to the [GraalVM SDK Changelog](https://github.com/oracle/graal/blob/master/sdk/CHANGELOG.md).
+* GR-46292 The deprecated `TruffleInstrument.Provider` and `TruffleLanguage.Provider` interfaces, deprecated since version 23.1, have now been removed. They are replaced by the `com.oracle.truffle.api.provider.TruffleLanguageProvider` and `com.oracle.truffle.api.instrumentation.provider.TruffleInstrumentProvider` interfaces. The implementations of these interfaces are automatically generated by the annotation processor and this change requires no source code modifications, only recompilation.
+* GR-46293 The deprecated `com.oracle.truffle.api.library.DefaultExportProvider` and `com.oracle.truffle.api.library.EagerExportProvider` interfaces, deprecated since version 23.1, have now been removed. They are replaced by the `com.oracle.truffle.api.library.provider.DefaultExportProvider` and `com.oracle.truffle.api.library.provider.EagerExportProvider` interfaces. The implementations of these interfaces are automatically generated by the annotation processor and this change requires no source code modifications, only recompilation.
 
 
 ## Version 24.1.0

diff --git a/truffle/mx.truffle/suite.py b/truffle/mx.truffle/suite.py
@@ -1719,10 +1719,6 @@
           "com.oracle.truffle.api.library.provider.EagerExportProvider",
           "com.oracle.truffle.api.instrumentation.provider.TruffleInstrumentProvider",
           "com.oracle.truffle.api.strings.provider.JCodingsProvider",
-          "com.oracle.truffle.api.library.DefaultExportProvider", # Deprecated
-          "com.oracle.truffle.api.library.EagerExportProvider", # Deprecated
-          "com.oracle.truffle.api.TruffleLanguage.Provider", # Deprecated
-          "com.oracle.truffle.api.instrumentation.TruffleInstrument.Provider", # Deprecated
         ],
       },
 

diff --git a/truffle/src/com.oracle.truffle.api.instrumentation/snapshot.sigtest b/truffle/src/com.oracle.truffle.api.instrumentation/snapshot.sigtest
@@ -395,7 +395,6 @@ innr protected abstract interface static ContextLocalFactory
 innr protected abstract interface static ContextThreadLocalFactory
 innr protected final static ContextLocalProvider
 innr public abstract interface static !annotation Registration
-innr public abstract interface static Provider
 innr public final static Env
 meth protected abstract void onCreate(com.oracle.truffle.api.instrumentation.TruffleInstrument$Env)
 meth protected final <%0 extends java.lang.Object> com.oracle.truffle.api.ContextLocal<{%%0}> createContextLocal(com.oracle.truffle.api.instrumentation.TruffleInstrument$ContextLocalFactory<{%%0}>)
@@ -468,13 +467,6 @@ supr java.lang.Object
 hfds err,in,instrumenter,messageTransport,options,out,polyglotInstrument,services
 hcls GuardedExecutableNode,MessageTransportProxy
 
-CLSS public abstract interface static com.oracle.truffle.api.instrumentation.TruffleInstrument$Provider
- outer com.oracle.truffle.api.instrumentation.TruffleInstrument
- anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="23.1")
-meth public abstract com.oracle.truffle.api.instrumentation.TruffleInstrument create()
-meth public abstract java.lang.String getInstrumentClassName()
-meth public abstract java.util.Collection<java.lang.String> getServicesClassNames()
-
 CLSS public abstract interface static !annotation com.oracle.truffle.api.instrumentation.TruffleInstrument$Registration
  outer com.oracle.truffle.api.instrumentation.TruffleInstrument
  anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
@@ -537,14 +529,6 @@ CLSS public abstract interface com.oracle.truffle.api.nodes.NodeInterface
 
 CLSS public abstract interface java.lang.Cloneable
 
-CLSS public abstract interface !annotation java.lang.Deprecated
- anno 0 java.lang.annotation.Documented()
- anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
- anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[CONSTRUCTOR, FIELD, LOCAL_VARIABLE, METHOD, PACKAGE, MODULE, PARAMETER, TYPE])
-intf java.lang.annotation.Annotation
-meth public abstract !hasdefault boolean forRemoval()
-meth public abstract !hasdefault java.lang.String since()
-
 CLSS public abstract interface !annotation java.lang.FunctionalInterface
  anno 0 java.lang.annotation.Documented()
  anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)

diff --git a/...fle.api.instrumentation/src/com/oracle/truffle/api/instrumentation/TruffleInstrument.java b/...fle.api.instrumentation/src/com/oracle/truffle/api/instrumentation/TruffleInstrument.java
@@ -55,11 +55,9 @@
 import java.nio.file.FileSystem;
 import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.ServiceLoader;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
@@ -101,7 +99,6 @@
 import com.oracle.truffle.api.frame.MaterializedFrame;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.InstrumentationHandler.InstrumentClientInstrumenter;
-import com.oracle.truffle.api.instrumentation.provider.TruffleInstrumentProvider;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.nodes.ExecutableNode;
 import com.oracle.truffle.api.nodes.LanguageInfo;
@@ -1515,40 +1512,6 @@ Class<?>[] services() default {
         Class<? extends InternalResource>[] internalResources() default {};
     }
 
-    /**
-     * Used to register a {@link TruffleInstrument} using a {@link ServiceLoader}. This interface is
-     * not intended to be implemented directly by an instrument developer, rather the implementation
-     * is generated by the Truffle DSL. The generated implementation has to inherit the
-     * {@link Registration} annotations from the {@link TruffleInstrument}.
-     *
-     * @since 19.3.0
-     * @deprecated Use {@link TruffleInstrumentProvider}.
-     */
-    @Deprecated(since = "23.1")
-    public interface Provider {
-
-        /**
-         * Returns the name of a class implementing the {@link TruffleInstrument}.
-         *
-         * @since 19.3.0
-         */
-        String getInstrumentClassName();
-
-        /**
-         * Creates a new instance of a {@link TruffleInstrument}.
-         *
-         * @since 19.3.0
-         */
-        TruffleInstrument create();
-
-        /**
-         * Returns the class names of provided services.
-         *
-         * @since 19.3.0
-         */
-        Collection<String> getServicesClassNames();
-    }
-
     static {
         try {
             // Instrument is loaded by Engine which should load InstrumentationHandler

diff --git a/truffle/src/com.oracle.truffle.api.library/snapshot.sigtest b/truffle/src/com.oracle.truffle.api.library/snapshot.sigtest
@@ -8,10 +8,6 @@ intf java.lang.annotation.Annotation
 meth public abstract !hasdefault java.lang.String limit()
 meth public abstract !hasdefault java.lang.String value()
 
-CLSS public abstract interface com.oracle.truffle.api.library.DefaultExportProvider
- anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="23.1")
-intf com.oracle.truffle.api.library.provider.DefaultExportProvider
-
 CLSS public abstract com.oracle.truffle.api.library.DynamicDispatchLibrary
 cons protected init()
 meth public abstract java.lang.Object cast(java.lang.Object)
@@ -20,10 +16,6 @@ meth public static com.oracle.truffle.api.library.LibraryFactory<com.oracle.truf
 supr com.oracle.truffle.api.library.Library
 hfds FACTORY
 
-CLSS public abstract interface com.oracle.truffle.api.library.EagerExportProvider
- anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="23.1")
-intf com.oracle.truffle.api.library.provider.EagerExportProvider
-
 CLSS public abstract interface !annotation com.oracle.truffle.api.library.ExportLibrary
  anno 0 java.lang.annotation.Repeatable(java.lang.Class<? extends java.lang.annotation.Annotation> value=class com.oracle.truffle.api.library.ExportLibrary$Repeat)
  anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
@@ -241,14 +233,6 @@ CLSS public abstract interface com.oracle.truffle.api.nodes.NodeInterface
 
 CLSS public abstract interface java.lang.Cloneable
 
-CLSS public abstract interface !annotation java.lang.Deprecated
- anno 0 java.lang.annotation.Documented()
- anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
- anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[CONSTRUCTOR, FIELD, LOCAL_VARIABLE, METHOD, PACKAGE, MODULE, PARAMETER, TYPE])
-intf java.lang.annotation.Annotation
-meth public abstract !hasdefault boolean forRemoval()
-meth public abstract !hasdefault java.lang.String since()
-
 CLSS public java.lang.Object
 cons public init()
 meth protected java.lang.Object clone() throws java.lang.CloneNotSupportedException

diff --git a/....oracle.truffle.api.library/src/com/oracle/truffle/api/library/DefaultExportProvider.java b/....oracle.truffle.api.library/src/com/oracle/truffle/api/library/DefaultExportProvider.java
diff --git a/...om.oracle.truffle.api.library/src/com/oracle/truffle/api/library/EagerExportProvider.java b/...om.oracle.truffle.api.library/src/com/oracle/truffle/api/library/EagerExportProvider.java
diff --git a/truffle/src/com.oracle.truffle.api/snapshot.sigtest b/truffle/src/com.oracle.truffle.api/snapshot.sigtest
@@ -445,7 +445,6 @@ innr protected abstract interface static ContextLocalFactory
 innr protected abstract interface static ContextThreadLocalFactory
 innr protected final static ContextLocalProvider
 innr public abstract interface static !annotation Registration
-innr public abstract interface static Provider
 innr public abstract static ContextReference
 innr public abstract static LanguageReference
 innr public final static !enum ContextPolicy
@@ -647,14 +646,6 @@ meth public java.util.List<java.lang.String> getArgumentNames()
 supr java.lang.Object
 hfds argumentNames,disposed,source
 
-CLSS public abstract interface static com.oracle.truffle.api.TruffleLanguage$Provider
- outer com.oracle.truffle.api.TruffleLanguage
- anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="23.1")
-meth public abstract com.oracle.truffle.api.TruffleLanguage<?> create()
-meth public abstract java.lang.String getLanguageClassName()
-meth public abstract java.util.Collection<java.lang.String> getServicesClassNames()
-meth public abstract java.util.List<com.oracle.truffle.api.TruffleFile$FileTypeDetector> createFileTypeDetectors()
-
 CLSS public abstract interface static !annotation com.oracle.truffle.api.TruffleLanguage$Registration
  outer com.oracle.truffle.api.TruffleLanguage
  anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)

diff --git a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleLanguage.java b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleLanguage.java
@@ -58,13 +58,11 @@
 import java.nio.file.attribute.FileAttribute;
 import java.time.ZoneId;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.ServiceLoader;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
@@ -95,7 +93,6 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.InternalResource.Id;
 import com.oracle.truffle.api.TruffleFile.FileSystemContext;
-import com.oracle.truffle.api.TruffleFile.FileTypeDetector;
 import com.oracle.truffle.api.TruffleLanguage.Env;
 import com.oracle.truffle.api.TruffleSafepoint.Interrupter;
 import com.oracle.truffle.api.TruffleSafepoint.Interruptible;
@@ -108,7 +105,6 @@
 import com.oracle.truffle.api.nodes.LanguageInfo;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.RootNode;
-import com.oracle.truffle.api.provider.TruffleLanguageProvider;
 import com.oracle.truffle.api.source.Source;
 
 /**
@@ -542,47 +538,6 @@ String[] dependentLanguages() default {
         Class<? extends InternalResource>[] internalResources() default {};
     }
 
-    /**
-     * Used to register a {@link TruffleLanguage} using a {@link ServiceLoader}. This interface is
-     * not intended to be implemented directly by a language developer, rather the implementation is
-     * generated by the Truffle DSL. The generated implementation has to inherit the
-     * {@link Registration} and {@code ProvidedTags} annotations from the {@link TruffleLanguage}.
-     *
-     * @since 19.3.0
-     * @deprecated Use {@link TruffleLanguageProvider}.
-     */
-    @Deprecated(since = "23.1")
-    public interface Provider {
-
-        /**
-         * Returns the name of a class implementing the {@link TruffleLanguage}.
-         *
-         * @since 19.3.0
-         */
-        String getLanguageClassName();
-
-        /**
-         * Creates a new instance of a {@link TruffleLanguage}.
-         *
-         * @since 19.3.0
-         */
-        TruffleLanguage<?> create();
-
-        /**
-         * Creates file type detectors used by the {@link TruffleLanguage}.
-         *
-         * @since 19.3.0
-         */
-        List<FileTypeDetector> createFileTypeDetectors();
-
-        /**
-         * Returns the class names of provided services.
-         *
-         * @since 19.3.0
-         */
-        Collection<String> getServicesClassNames();
-    }
-
     /**
      * Provider for creating context local and context thread local references.
      *