Declare default export for DynamicObjectLibrary without service lookup.

Remove DynamicObject accessor used for service provider lookup.

Author: woess

truffle/src/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/DynamicObjectLibrary.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -96,7 +96,8 @@
  *
  * @since 20.2.0
  */
-@GenerateLibrary(defaultExportLookupEnabled = true, dynamicDispatchEnabled = false, pushEncapsulatingNode = false)
+@GenerateLibrary(defaultExportLookupEnabled = false, dynamicDispatchEnabled = false, pushEncapsulatingNode = false)
+@GenerateLibrary.DefaultExport(DynamicObjectLibraryImpl.class)
 public abstract class DynamicObjectLibrary extends Library {
 
     private static final LibraryFactory<DynamicObjectLibrary> FACTORY = LibraryFactory.resolve(DynamicObjectLibrary.class);

truffle/src/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/DynamicObjectSupportImpl.java

@@ -1370,18 +1370,6 @@ protected InstrumentProviderSupport() {
         public abstract InternalResource createInternalResource(Object truffleInstrumentProvider, String resourceId);
     }
 
-    public abstract static class DynamicObjectSupport extends Support {
-
-        static final String IMPL_CLASS_NAME = "com.oracle.truffle.api.object.DynamicObjectSupportImpl";
-
-        protected DynamicObjectSupport() {
-            super(IMPL_CLASS_NAME);
-        }
-
-        public abstract <T> Iterable<T> lookupTruffleService(Class<T> type);
-
-    }
-
     /*
      * We want to avoid exporting {@code jdk.internal.module} and {@code jdk.internal.access} to all
      * classes in the unnamed module. So instead we load it in an isolated class loader and own
@@ -1505,7 +1493,6 @@ private static final class Constants {
         private static final Accessor.RuntimeSupport RUNTIME;
         private static final Accessor.LanguageProviderSupport LANGUAGE_PROVIDER;
         private static final Accessor.InstrumentProviderSupport INSTRUMENT_PROVIDER;
-        private static final DynamicObjectSupport DYNAMIC_OBJECT;
         private static final Accessor.MemorySupport MEMORY_SUPPORT;
 
         static {
@@ -1524,7 +1511,6 @@ private static final class Constants {
             RUNTIME = getTVMCI().createRuntimeSupport(RuntimeSupport.PERMISSION);
             LANGUAGE_PROVIDER = loadSupport(LanguageProviderSupport.IMPL_CLASS_NAME);
             INSTRUMENT_PROVIDER = loadSupport(InstrumentProviderSupport.IMPL_CLASS_NAME);
-            DYNAMIC_OBJECT = loadSupport(DynamicObjectSupport.IMPL_CLASS_NAME);
             MEMORY_SUPPORT = loadSupport(MemorySupport.IMPL_CLASS_NAME);
             STRINGS = loadSupport(StringsSupport.IMPL_CLASS_NAME);
         }
@@ -1635,10 +1621,6 @@ public final InstrumentProviderSupport instrumentProviderSupport() {
         return Constants.INSTRUMENT_PROVIDER;
     }
 
-    public final DynamicObjectSupport dynamicObjectSupport() {
-        return Constants.DYNAMIC_OBJECT;
-    }
-
     public final MemorySupport memorySupport() {
         return Constants.MEMORY_SUPPORT;
     }

truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/Accessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -157,7 +157,6 @@ final class EngineAccessor extends Accessor {
     static final HostSupport HOST = ACCESSOR.hostSupport();
     static final LanguageProviderSupport LANGUAGE_PROVIDER = ACCESSOR.languageProviderSupport();
     static final InstrumentProviderSupport INSTRUMENT_PROVIDER = ACCESSOR.instrumentProviderSupport();
-    static final DynamicObjectSupport DYNAMIC_OBJECT = ACCESSOR.dynamicObjectSupport();
 
     private static List<AbstractClassLoaderSupplier> locatorLoaders() {
         if (ImageInfo.inImageRuntimeCode()) {
@@ -348,12 +347,10 @@ private static PolyglotContextImpl getPolyglotContext(TruffleContext truffleCont
         @SuppressWarnings("deprecation")
         public <T> Iterable<T> loadServices(Class<T> type) {
             Map<Class<?>, T> found = new LinkedHashMap<>();
-            // 1) Add known Truffle DynamicObjectLibraryProvider service.
-            DYNAMIC_OBJECT.lookupTruffleService(type).forEach((s) -> found.putIfAbsent(s.getClass(), s));
             for (AbstractClassLoaderSupplier loaderSupplier : EngineAccessor.locatorOrDefaultLoaders()) {
                 ClassLoader loader = loaderSupplier.get();
                 if (loader != null) {
-                    // 2) Lookup implementations of a module aware interface
+                    // Lookup implementations of a module aware interface
                     for (T service : ServiceLoader.load(type, loader)) {
                         if (loaderSupplier.accepts(service.getClass())) {
                             JDKSupport.exportTransitivelyTo(service.getClass().getModule());