Automatic merge of master into galahad

Author: OracleLabsAutomation

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CheckGraalInvariants.java

@@ -546,10 +546,10 @@ private static void loadVerifiers(List<VerifyPhase<CoreProviders>> verifiers) {
     }
 
     /**
-     * Initializes a map from a field annotated by {@link Option} to a set that will be used to
-     * collect methods that accesses the option field.
-     *
-     * @param tool
+     * Initializes a map from fields annotated with {@link Option} whose usages should be checked to
+     * empty sets that will collect the methods accessing each field.
+     * <p>
+     * The sets are synchronized to support parallel processing of methods.
      */
     private static Map<ResolvedJavaField, Set<ResolvedJavaMethod>> initOptionFieldUsagesMap(InvariantsTool tool, MetaAccessProvider metaAccess, List<String> errors) {
         Map<ResolvedJavaField, Set<ResolvedJavaMethod>> optionFields = new EconomicHashMap<>();
@@ -559,7 +559,7 @@ private static Map<ResolvedJavaField, Set<ResolvedJavaMethod>> initOptionFieldUs
                     Class<?> declaringClass = option.getDeclaringClass();
                     try {
                         Field javaField = declaringClass.getDeclaredField(option.getFieldName());
-                        optionFields.put(metaAccess.lookupJavaField(javaField), new EconomicHashSet<>());
+                        optionFields.put(metaAccess.lookupJavaField(javaField), Collections.synchronizedSet(new EconomicHashSet<>()));
                     } catch (NoSuchFieldException e) {
                         errors.add(e.toString());
                     }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Resources.java

@@ -132,15 +132,15 @@ public static Resources[] layeredSingletons() {
     private final EconomicMap<RequestedPattern, RuntimeConditionSet> requestedPatterns = ImageHeapMap.createNonLayeredMap();
 
     /**
-     * The string representation of {@link ModuleResourceKey} that are already registered in
-     * previous layers. Since the {@link ModuleResourceKey} contains a reference to a
+     * The string representation of {@link ModuleNameResourceKey} that are already registered in
+     * previous layers. Since the {@link ModuleInstanceResourceKey} contains a reference to a
      * {@link Module}, the {@link Module} name is used instead of the object itself in the string
-     * representation. This works under the assumption that all modules have a different unique name
-     * in Layered Images. More details can be found in
-     * {@link Resources#getModuleResourceKeyString(ModuleResourceKey)}.
+     * representation. This works under the assumption (enforced by
+     * LayeredModuleSingleton.setPackages) that all modules have a different unique name in Layered
+     * Images.
      *
-     * The boolean associated to each {@link ModuleResourceKey} is true if the registered value is
-     * complete and false in the case of a negative query.
+     * The boolean associated to each {@link ModuleNameResourceKey} is true if the registered value
+     * is complete and false in the case of a negative query.
      */
     @Platforms(Platform.HOSTED_ONLY.class) //
     private final Map<String, Boolean> previousLayerResources;
@@ -155,7 +155,65 @@ public static Resources[] layeredSingletons() {
     public record RequestedPattern(String module, String resource) {
     }
 
-    public record ModuleResourceKey(Module module, String resource) {
+    public interface ModuleResourceKey {
+        Module getModule();
+
+        String getModuleName();
+
+        Object module();
+
+        String resource();
+    }
+
+    /**
+     * In standalone images, the module object is the {@link Module} reference itself.
+     */
+    public record ModuleInstanceResourceKey(Module module, String resource) implements ModuleResourceKey {
+        public ModuleInstanceResourceKey {
+            assert !ImageLayerBuildingSupport.buildingImageLayer() : "The ModuleInstanceResourceKey should only be used in standalone images.";
+        }
+
+        @Override
+        public Module getModule() {
+            return module;
+        }
+
+        @Override
+        public String getModuleName() {
+            if (module == null) {
+                return null;
+            }
+            return module.getName();
+        }
+    }
+
+    /**
+     * In Layered Image, only the module name is stored in the record.
+     */
+    public record ModuleNameResourceKey(Object module, String resource) implements ModuleResourceKey {
+        public ModuleNameResourceKey {
+            /*
+             * A null module in the ModuleResourceKey represents any unnamed module, meaning that
+             * only one marker (null) is needed for all of them and that if the module is not null,
+             * it is named (see Resources.createStorageKey). This string representation relies on
+             * the assumption (enforced by LayeredModuleSingleton.setPackages) that a layered image
+             * build cannot contain two modules with the same name, so Module#getName() is
+             * guaranteed to be unique for layered images.
+             */
+            assert module == null || module instanceof Module : "The ModuleNameResourceKey constructor should only be called with a Module as first argument";
+            assert ImageLayerBuildingSupport.buildingImageLayer() : "The ModuleNameResourceKey should only be used in layered images.";
+            module = (module != null) ? ((Module) module).getName() : module;
+        }
+
+        @Override
+        public Module getModule() {
+            throw VMError.shouldNotReachHere("Accessing the module instance of the ModuleResourceKey is not supported in layered images.");
+        }
+
+        @Override
+        public String getModuleName() {
+            return (String) module;
+        }
     }
 
     /**
@@ -251,7 +309,7 @@ public static ModuleResourceKey createStorageKey(Module module, String resourceN
                 m = currentLayer().hostedToRuntimeModuleMapper.apply(m);
             }
         }
-        return new ModuleResourceKey(m, resourceName);
+        return ImageLayerBuildingSupport.buildingImageLayer() ? new ModuleNameResourceKey(m, resourceName) : new ModuleInstanceResourceKey(m, resourceName);
     }
 
     @Platforms(Platform.HOSTED_ONLY.class) //
@@ -262,9 +320,8 @@ public void setHostedToRuntimeModuleMapper(Function<Module, Module> hostedToRunt
     @Platforms(Platform.HOSTED_ONLY.class)
     public static Set<String> getIncludedResourcesModules() {
         return StreamSupport.stream(currentLayer().resources.getKeys().spliterator(), false)
-                        .map(ModuleResourceKey::module)
+                        .map(ModuleResourceKey::getModuleName)
                         .filter(Objects::nonNull)
-                        .map(Module::getName)
                         .collect(Collectors.toSet());
     }
 
@@ -282,21 +339,8 @@ private void updateTimeStamp() {
         }
     }
 
-    private static String getModuleResourceKeyString(ModuleResourceKey m) {
-        /*
-         * A null module in the ModuleResourceKey represents any unnamed module, meaning that only
-         * one marker is needed for all of them and that if the module is not null, it is named (see
-         * Resources.createStorageKey). This string representation relies on the assumption that a
-         * layered image build cannot contain two modules with the same name, so Module#getName() is
-         * guaranteed to be unique for layered images.
-         */
-        String moduleName = m.module == null ? LayeredModuleSingleton.ALL_UNNAMED_MODULE_NAME : m.module.getName();
-        return moduleName + m.resource;
-    }
-
     private void addResource(ModuleResourceKey key, ConditionalRuntimeValue<ResourceStorageEntryBase> entry) {
-        String moduleResourceKeyString = getModuleResourceKeyString(key);
-        Boolean previousLayerData = previousLayerResources.get(moduleResourceKeyString);
+        Boolean previousLayerData = ImageLayerBuildingSupport.buildingImageLayer() ? previousLayerResources.get(key.toString()) : null;
         if (previousLayerData == null || (!previousLayerData && entry.getValueUnconditionally() != NEGATIVE_QUERY_MARKER)) {
             resources.put(key, entry);
         }
@@ -721,7 +765,7 @@ public PersistFlags preparePersist(ImageSingletonWriter writer) {
 
         var cursor = resources.getEntries();
         while (cursor.advance()) {
-            resourceKeys.add(getModuleResourceKeyString(cursor.getKey()));
+            resourceKeys.add(cursor.getKey().toString());
             boolean isNegativeQuery = cursor.getValue().getValueUnconditionally() == NEGATIVE_QUERY_MARKER;
             resourceRegistrationStates.add(!isNegativeQuery);
         }

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/EmbeddedResourceExporter.java

@@ -51,7 +51,7 @@ public class EmbeddedResourceExporter {
     public record SourceSizePair(String source, Object origin, int size) {
     }
 
-    public record ResourceReportEntry(Module module, String resourceName, List<SourceSizePair> entries, boolean isDirectory, boolean isMissing) {
+    public record ResourceReportEntry(String module, String resourceName, List<SourceSizePair> entries, boolean isDirectory, boolean isMissing) {
     }
 
     public static void printReport(JsonWriter writer) throws IOException {
@@ -65,7 +65,7 @@ private static void resourceReportElement(ResourceReportEntry p, JsonWriter w) t
         w.appendObjectStart();
         w.appendKeyValue("name", p.resourceName()).appendSeparator();
         if (p.module() != null) {
-            w.appendKeyValue("module", p.module().getName()).appendSeparator();
+            w.appendKeyValue("module", p.module()).appendSeparator();
         }
 
         if (p.isDirectory()) {
@@ -100,7 +100,7 @@ public static List<ResourceReportEntry> getResourceReportEntryList(ConcurrentHas
 
         List<ResourceReportEntry> resourceInfoList = new ArrayList<>();
         Resources.currentLayer().forEachResource((key, value) -> {
-            Module module = key.module();
+            String module = key.getModuleName();
             String resourceName = key.resource();
 
             ResourceStorageEntryBase storageEntry = value.getValueUnconditionally();

vm/ci/ci_common/common.jsonnet

@@ -265,10 +265,14 @@ local devkits = graal_common.devkits;
     polyglot_isolate_distributions(language_ids, current_os, current_arch, current_only=false)::
       std.flattenArrays([self.language_polyglot_isolate_distributions(id, current_os, current_arch, current_only) for id in language_ids]),
 
-    # To add a polyglot isolate build for a language, ensure that the language is included in the `ee_suites`
-    # and add the language id to `polyglot_isolate_languages`.
+    # To enable polyglot isolate builds for a language:
+    # 1. Add the language ID to `polyglot_isolate_languages`.
+    # 2. Ensure the language is either:
+    #    - already included in `ee_suites`, or
+    #    - its suite is listed in `polyglot_isolate_ce_suites`.
     local polyglot_isolate_languages = ['js', 'python'],
-
+    local polyglot_isolate_ce_suites = ['graal-js', 'graalpython'],
+    local polyglot_isolate_mx_args = std.flattenArrays([['--suite', s] for s in polyglot_isolate_ce_suites]),
 
     legacy_mx_args:: [],  # `['--force-bash-launcher=true', '--skip-libraries=true']` have been replaced by arguments from `vm.maven_deploy_base_functions.mx_args(os, arch)`
     mx_args(os, arch, reduced):: self.legacy_mx_args + vm.maven_deploy_base_functions.mx_args(os, arch, reduced),
@@ -327,8 +331,8 @@ local devkits = graal_common.devkits;
         if (vm.maven_deploy_base_functions.edition == 'ce') then
           self.deploy_ce(os, arch, false, dry_run, [remote_mvn_repo])
         else
-          self.deploy_ee(os, arch, false, dry_run, ['--dummy-javadoc', '--skip', std.join(',', self.polyglot_isolate_distributions(polyglot_isolate_languages, os, arch)) + ',TOOLS_COMMUNITY,LANGUAGES_COMMUNITY', remote_mvn_repo])
-          + self.deploy_ee(os, arch, false, dry_run, ['--dummy-javadoc', '--only', std.join(',', self.polyglot_isolate_distributions(polyglot_isolate_languages, os, arch, true)) + ',TOOLS_COMMUNITY,LANGUAGES_COMMUNITY', remote_mvn_repo], extra_mx_args=['--suite', 'graal-js']);
+          self.deploy_ee(os, arch, false, dry_run, ['--dummy-javadoc', '--skip', std.join(',', self.polyglot_isolate_distributions(polyglot_isolate_languages, os, arch)) + ',TOOLS,LANGUAGES,TOOLS_COMMUNITY,LANGUAGES_COMMUNITY', remote_mvn_repo])
+          + self.deploy_ee(os, arch, false, dry_run, ['--dummy-javadoc', '--only', std.join(',', self.polyglot_isolate_distributions(polyglot_isolate_languages, os, arch, true)) + ',TOOLS,LANGUAGES,TOOLS_COMMUNITY,LANGUAGES_COMMUNITY', remote_mvn_repo], extra_mx_args=polyglot_isolate_mx_args);
 
       local mvn_bundle_snippet =
         [
@@ -342,8 +346,8 @@ local devkits = graal_common.devkits;
           if (vm.maven_deploy_base_functions.edition == 'ce') then
             self.deploy_ce(os, arch, false, dry_run, [local_repo, '${LOCAL_MAVEN_REPO_URL}'])
           else
-            self.deploy_ce(os, arch, false, dry_run, ['--dummy-javadoc', '--skip', std.join(',', self.polyglot_isolate_distributions(polyglot_isolate_languages, os, arch)) + ',TOOLS_COMMUNITY,LANGUAGES_COMMUNITY', local_repo, '${LOCAL_MAVEN_REPO_URL}'])
-            + self.deploy_ee(os, arch, false, dry_run, ['--dummy-javadoc', '--only', std.join(',', self.polyglot_isolate_distributions(polyglot_isolate_languages, os, arch)) + ',TOOLS_COMMUNITY,LANGUAGES_COMMUNITY', local_repo, '${LOCAL_MAVEN_REPO_URL}'], extra_mx_args=['--suite', 'graal-js'])
+            self.deploy_ce(os, arch, false, dry_run, ['--dummy-javadoc', '--skip', std.join(',', self.polyglot_isolate_distributions(polyglot_isolate_languages, os, arch)) + ',TOOLS,LANGUAGES,TOOLS_COMMUNITY,LANGUAGES_COMMUNITY', local_repo, '${LOCAL_MAVEN_REPO_URL}'])
+            + self.deploy_ee(os, arch, false, dry_run, ['--dummy-javadoc', '--only', std.join(',', self.polyglot_isolate_distributions(polyglot_isolate_languages, os, arch)) + ',TOOLS,LANGUAGES,TOOLS_COMMUNITY,LANGUAGES_COMMUNITY', local_repo, '${LOCAL_MAVEN_REPO_URL}'], extra_mx_args=polyglot_isolate_mx_args)
             + self.deploy_ee(os, arch, false, dry_run, ['--dummy-javadoc', local_repo, '${LOCAL_MAVEN_REPO_URL}'])
         )
         + (
@@ -374,7 +378,7 @@ local devkits = graal_common.devkits;
           + (
             # Locally deploy all relevant suites
             self.deploy_ce(os, arch, true, dry_run, ['--dummy-javadoc', '--only', vm.maven_deploy_base_functions.reduced_ce_dists, local_repo, '${LOCAL_MAVEN_REDUCED_REPO_URL}'])
-            + self.deploy_ee(os, arch, true, dry_run, ['--dummy-javadoc', '--only', vm.maven_deploy_base_functions.reduced_ee_dists, local_repo, '${LOCAL_MAVEN_REDUCED_REPO_URL}'], extra_mx_args=['--suite', 'graal-js'])
+            + self.deploy_ee(os, arch, true, dry_run, ['--dummy-javadoc', '--only', vm.maven_deploy_base_functions.reduced_ee_dists, local_repo, '${LOCAL_MAVEN_REDUCED_REPO_URL}'], extra_mx_args=polyglot_isolate_mx_args)
           )
           + (
             # Archive and deploy
@@ -425,7 +429,7 @@ local devkits = graal_common.devkits;
           else
             self.build(os, arch, reduced=false, build_args=['--targets=' + self.only_native_dists + ',' + std.join(',', self.polyglot_isolate_distributions(polyglot_isolate_languages, os, arch, true)) + ',{PLATFORM_DEPENDENT_LAYOUT_DIR_DISTRIBUTIONS}']) +
             [['echo', 'Skipping the deployment of ' + self.only_native_dists + ': It is already deployed by the ce job']] +
-            self.deploy_ee(os, arch, false, dry_run, ['--dummy-javadoc', '--only', std.join(',', self.polyglot_isolate_distributions(polyglot_isolate_languages, os, arch, true)), remote_mvn_repo], extra_mx_args=['--suite', 'graal-js'])
+            self.deploy_ee(os, arch, false, dry_run, ['--dummy-javadoc', '--only', std.join(',', self.polyglot_isolate_distributions(polyglot_isolate_languages, os, arch, true)), remote_mvn_repo], extra_mx_args=polyglot_isolate_mx_args)
         )
         + [self.mx_cmd_base(os, arch, reduced=false) + ['archive-pd-layouts', self.pd_layouts_archive_name(os + '-' + arch)]]
       ),