Skip to content

Commit

Permalink
Optimize ModuleLayerFeature.replicateVisibilityModifications
Browse files Browse the repository at this point in the history
  • Loading branch information
@ivan-ristovic
ivan-ristovic committed May 20, 2024
1 parent 98f0700 commit 6a065ce
Showing 1 changed file with 47 additions and 40 deletions.
87 changes: 47 additions & 40 deletions substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ModuleLayerFeature.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -463,66 +463,73 @@ private ModuleLayer synthesizeRuntimeModuleLayer(List<ModuleLayer> parentLayers,
}
}

private void replicateVisibilityModifications(ModuleLayer runtimeBootLayer, AfterAnalysisAccessImpl accessImpl, ImageClassLoader cl, Set<Module> analysisReachableNamedModules, Set<Module> analysisReachableUnnamedModules) {
private void replicateVisibilityModifications(ModuleLayer runtimeBootLayer, AfterAnalysisAccessImpl accessImpl, ImageClassLoader cl, Set<Module> analysisReachableNamedModules,
Set<Module> analysisReachableUnnamedModules) {
List<Module> applicationModules = findApplicationModules(runtimeBootLayer, cl.applicationModulePath());

Map<Module, Module> namedModulePairs = analysisReachableNamedModules
.stream()
.collect(Collectors.toMap(m -> m, m -> moduleLayerFeatureUtils.getRuntimeModuleForHostedModule(m, false)));
.collect(Collectors.toMap(Function.identity(), m -> moduleLayerFeatureUtils.getRuntimeModuleForHostedModule(m, false)));
Map<Module, Module> unnamedModulePairs = analysisReachableUnnamedModules
.stream()
.collect(Collectors.toMap(m -> m, m -> moduleLayerFeatureUtils.getRuntimeModuleForHostedModule(m, false)));
.collect(Collectors.toMap(Function.identity(), m -> moduleLayerFeatureUtils.getRuntimeModuleForHostedModule(m, false)));
unnamedModulePairs.put(moduleLayerFeatureUtils.allUnnamedModule, moduleLayerFeatureUtils.allUnnamedModule);
unnamedModulePairs.put(moduleLayerFeatureUtils.everyoneModule, moduleLayerFeatureUtils.everyoneModule);

Module builderModule = ModuleLayerFeatureUtils.getBuilderModule();
assert builderModule != null;

try {
for (Map.Entry<Module, Module> e1 : namedModulePairs.entrySet()) {
Module hostedFrom = e1.getKey();
Module runtimeFrom = e1.getValue();
Set<Map.Entry<Module, Module>> allModules = new HashSet<>(namedModulePairs.entrySet());
allModules.addAll(unnamedModulePairs.entrySet());
for (Map.Entry<Module, Module> e2 : allModules) {
Module hostedTo = e2.getKey();
if (hostedTo == hostedFrom) {
continue;
}
Module runtimeTo = e2.getValue();
if (ModuleLayerFeatureUtils.isModuleSynthetic(hostedFrom) || hostedFrom.canRead(hostedTo)) {
moduleLayerFeatureUtils.addReads(accessImpl, runtimeFrom, runtimeTo);
if (hostedFrom == builderModule) {
for (Module appModule : applicationModules) {
moduleLayerFeatureUtils.addReads(accessImpl, appModule, runtimeTo);
}
}
}
for (String pn : runtimeFrom.getPackages()) {
if (ModuleLayerFeatureUtils.isModuleSynthetic(hostedFrom) || hostedFrom.isOpen(pn, hostedTo)) {
moduleLayerFeatureUtils.addOpens(accessImpl, runtimeFrom, pn, runtimeTo);
if (hostedTo == builderModule) {
for (Module appModule : applicationModules) {
moduleLayerFeatureUtils.addOpens(accessImpl, runtimeFrom, pn, appModule);
}
}
}
if (ModuleLayerFeatureUtils.isModuleSynthetic(hostedFrom) || hostedFrom.isExported(pn, hostedTo)) {
moduleLayerFeatureUtils.addExports(accessImpl, runtimeFrom, pn, runtimeTo);
if (hostedTo == builderModule) {
for (Module appModule : applicationModules) {
moduleLayerFeatureUtils.addExports(accessImpl, runtimeFrom, pn, appModule);
}
}
}
}
for (Map.Entry<Module, Module> e2 : namedModulePairs.entrySet()) {
replicateVisibilityModification(accessImpl, applicationModules, hostedFrom, e2.getKey(), runtimeFrom, e2.getValue());
}
for (Map.Entry<Module, Module> e2 : unnamedModulePairs.entrySet()) {
replicateVisibilityModification(accessImpl, applicationModules, hostedFrom, e2.getKey(), runtimeFrom, e2.getValue());
}
}
} catch (IllegalAccessException ex) {
throw VMError.shouldNotReachHere("Failed to transfer hosted module relations to the runtime boot module layer.", ex);
}
}

private void replicateVisibilityModification(AfterAnalysisAccessImpl accessImpl, List<Module> applicationModules, Module hostedFrom, Module hostedTo, Module runtimeFrom, Module runtimeTo)
throws IllegalAccessException {
if (hostedTo == hostedFrom) {
return;
}

Module builderModule = ModuleLayerFeatureUtils.getBuilderModule();
assert builderModule != null;

if (ModuleLayerFeatureUtils.isModuleSynthetic(hostedFrom) || hostedFrom.canRead(hostedTo)) {
moduleLayerFeatureUtils.addReads(accessImpl, runtimeFrom, runtimeTo);
if (hostedFrom == builderModule) {
for (Module appModule : applicationModules) {
moduleLayerFeatureUtils.addReads(accessImpl, appModule, runtimeTo);
}
}
}

for (String pn : runtimeFrom.getPackages()) {
if (ModuleLayerFeatureUtils.isModuleSynthetic(hostedFrom) || hostedFrom.isOpen(pn, hostedTo)) {
moduleLayerFeatureUtils.addOpens(accessImpl, runtimeFrom, pn, runtimeTo);
if (hostedTo == builderModule) {
for (Module appModule : applicationModules) {
moduleLayerFeatureUtils.addOpens(accessImpl, runtimeFrom, pn, appModule);
}
}
}
if (ModuleLayerFeatureUtils.isModuleSynthetic(hostedFrom) || hostedFrom.isExported(pn, hostedTo)) {
moduleLayerFeatureUtils.addExports(accessImpl, runtimeFrom, pn, runtimeTo);
if (hostedTo == builderModule) {
for (Module appModule : applicationModules) {
moduleLayerFeatureUtils.addExports(accessImpl, runtimeFrom, pn, appModule);
}
}
}
}
}

private void replicateNativeAccess(AfterAnalysisAccessImpl accessImpl, Set<Module> analysisReachableNamedModules) {
Map<Module, Module> modulePairs = analysisReachableNamedModules
.stream()
Expand Down

0 comments on commit 6a065ce

Please sign in to comment.