[GR-55215] Enforce runtime module layer ordering

ivan-ristovic · ivan-ristovic · commit 5f17890acbd1 · 2024-07-23T05:09:14.000Z
PullRequest: graal/18256
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,

Original file line number	Diff line number	Diff line change
`@@ -426,8 +426,8 @@ private List<ModuleLayer> synthesizeRuntimeModuleLayers(AfterAnalysisAccessImpl`
`426`	`426`	`moduleLayerPairs.put(hostedModuleLayer, runtimeModuleLayer);`
`427`	`427`	`}`
`428`	`428`
`429`		`- moduleLayerPairs.remove(ModuleLayer.empty());`
`430`		`- return new ArrayList<>(moduleLayerPairs.values());`
	`429`	`+ List<ModuleLayer> runtimeModuleLayers = hostedModuleLayers.stream().map(moduleLayerPairs::get).filter(Objects::nonNull).toList();`
	`430`	`+ return runtimeModuleLayers;`
`431`	`431`	`}`
`432`	`432`
`433`	`433`	`private ModuleLayer synthesizeRuntimeModuleLayer(List<ModuleLayer> parentLayers, AnalysisAccessBase accessImpl, ImageClassLoader cl, Set<String> reachableModules,`