Skip to content

[GR-32505] Make NativeImageClassLoaderSupport#initAllClasses take jdk.module.upgrade.path into account. #3552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 8, 2021
Merged

[GR-32505] Make NativeImageClassLoaderSupport#initAllClasses take jdk.module.upgrade.path into account. #3552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf2a933
Make NativeImageClassLoaderSupport#initAllClasses take jdk.module.upg…
dougxc Jul 7, 2021
1b482ba
Run gate-svm-style-fullbuild with MX_BUILD_EXPLODED=true
olpaw Jul 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions substratevm/ci_includes/gate.hocon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ builds += [
timelimit: "45:00"
environment : {
MAVEN_REPO_LOCAL : "$BUILD_DIR/.m2"
MX_BUILD_EXPLODED : "true"
}
run: [
${svm-cmd-gate} ["style,fullbuild,helloworld,test,svmjunit,maven"]
Expand Down
37 changes: 36 additions & 1 deletion .../com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/NativeImageClassLoaderSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,41 @@ public ClassLoader getClassLoader() {
return classLoader;
}

private static ModuleFinder upgradeAndSystemModuleFinder;

/**
* Creates a finder from a module path specified by the {@code prop} system property.
*/
private static ModuleFinder finderFor(String prop) {
String s = System.getProperty(prop);
if (s == null || s.isEmpty()) {
return null;
} else {
String[] dirs = s.split(File.pathSeparator);
Path[] paths = new Path[dirs.length];
int i = 0;
for (String dir : dirs) {
paths[i++] = Path.of(dir);
}
return ModuleFinder.of(paths);
}
}

/**
* Gets a finder that locates the upgrade modules and the system modules, in that order.
*/
private static ModuleFinder getUpgradeAndSystemModuleFinder() {
if (upgradeAndSystemModuleFinder == null) {
ModuleFinder finder = ModuleFinder.ofSystem();
ModuleFinder upgradeModulePath = finderFor("jdk.module.upgrade.path");
if (upgradeModulePath != null) {
finder = ModuleFinder.compose(upgradeModulePath, finder);
}
upgradeAndSystemModuleFinder = finder;
}
return upgradeAndSystemModuleFinder;
}

private class ClassInitWithModules extends ClassInit {

ClassInitWithModules(ForkJoinPool executor, ImageClassLoader imageClassLoader) {
Expand All @@ -260,7 +295,7 @@ protected void init() {
"jdk.internal.vm.ci", "jdk.internal.vm.compiler", "com.oracle.graal.graal_enterprise",
"org.graalvm.sdk", "org.graalvm.truffle");

for (ModuleReference moduleReference : ModuleFinder.ofSystem().findAll()) {
for (ModuleReference moduleReference : getUpgradeAndSystemModuleFinder().findAll()) {
if (requiresInit.contains(moduleReference.descriptor().name())) {
initModule(moduleReference);
}
Expand Down