[GR-56213] Backport to 24.1: Runtime module layer ordering is not det…

…erministic PullRequest: graal/18418
oracle · Jul 29, 2024 · ef229c1 · ef229c1
2 parents 4fd1055 + 9afe63c
commit ef229c1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ModuleLayerFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ModuleLayerFeature.java
@@ -426,8 +426,8 @@ private List<ModuleLayer> synthesizeRuntimeModuleLayers(AfterAnalysisAccessImpl
             moduleLayerPairs.put(hostedModuleLayer, runtimeModuleLayer);
         }
 
-        moduleLayerPairs.remove(ModuleLayer.empty());
-        return new ArrayList<>(moduleLayerPairs.values());
+        List<ModuleLayer> runtimeModuleLayers = hostedModuleLayers.stream().map(moduleLayerPairs::get).filter(Objects::nonNull).toList();
+        return runtimeModuleLayers;
     }
 
     private ModuleLayer synthesizeRuntimeModuleLayer(List<ModuleLayer> parentLayers, AnalysisAccessBase accessImpl, ImageClassLoader cl, Set<String> reachableModules,