Skip to content

[GR-34444] Replicate hosted module relations in runtime boot module layer #3991

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 16 commits into from
Nov 27, 2021
Merged

[GR-34444] Replicate hosted module relations in runtime boot module layer #3991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
29a0721
Reset Module.ReflectionData maps; Remove ad-hoc fix for ResourceBundles
Nov 4, 2021
a4b806b
Transfer hosted module graph modifications to runtime boot module layer
Nov 4, 2021
6a307af
Patch dynamic hubs to point to synthesized Module instances
Nov 4, 2021
1a26eb6
Include librarysupport module in boot layer
Nov 4, 2021
68d2936
Ignore application modules that are not reachable
Nov 5, 2021
1e6db8a
Ignore unnamed modules during dynamic hub patching
Nov 5, 2021
b0cbe09
Mark methods as static where appropriate
Nov 8, 2021
f1fc11a
Transfer visibility for application modules
Nov 16, 2021
50768cc
Restore -ea flag for hellomodule
Nov 16, 2021
ad1d42f
Add assertion check to hellomodule
Nov 16, 2021
5887dac
Include synthetic modules from the hosted boot module layer
Nov 18, 2021
52963d3
Ensure that jdk.jfr.events package is opened to the builder
Nov 18, 2021
c9266a8
Replicate ALL-UNNAMED and EVERYONE module relations
Nov 20, 2021
24fdee5
Treat synthetic modules separately
Nov 23, 2021
21ee6c3
Patch loader fields of boot layer modules
Nov 25, 2021
bd3ce8e
Patch Module.loader fields of synthesized modules
Nov 25, 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/mx.substratevm/mx_substratevm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1097,6 +1097,7 @@ def hellomodule(args):
with native_image_context(hosted_assertions=False, config=config) as native_image:
module_path_sep = ';' if mx.is_windows() else ':'
moduletest_run_args = [
'-ea',
'--add-exports=moduletests.hello.lib/hello.privateLib=moduletests.hello.app',
'--add-opens=moduletests.hello.lib/hello.privateLib2=moduletests.hello.app',
'-p', module_path_sep.join(module_path), '-m', 'moduletests.hello.app'
Expand Down
22 changes: 9 additions & 13 deletions ...le.svm.core.jdk11/src/com/oracle/svm/core/jdk11/Target_java_lang_Module_JDK11OrLater.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@
*/
package com.oracle.svm.core.jdk11;

import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.util.Arrays;
import java.util.Map;
import java.util.Objects;

import com.oracle.svm.core.annotate.Alias;
import com.oracle.svm.core.annotate.RecomputeFieldValue;
import com.oracle.svm.core.annotate.Substitute;
Expand All @@ -34,23 +40,10 @@
import com.oracle.svm.core.jdk.Resources;
import com.oracle.svm.core.jdk.resources.ResourceStorageEntry;

import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.util.Arrays;
import java.util.Map;
import java.util.Objects;

@SuppressWarnings("unused")
@TargetClass(value = java.lang.Module.class, onlyWith = JDK11OrLater.class)
public final class Target_java_lang_Module_JDK11OrLater {

@SuppressWarnings({"unused", "static-method"})
@Substitute
public boolean isReflectivelyExportedOrOpen(String pn, Module other, boolean open) {
// This workaround should be removed once GR-34444 is fixed.
return true;
}

@SuppressWarnings("static-method")
@Substitute
public InputStream getResourceAsStream(String name) {
Expand Down Expand Up @@ -97,10 +90,13 @@ private static void addExportsToAllUnnamed0(Module from, String pn) {

@TargetClass(className = "java.lang.Module", innerClass = "ReflectionData", onlyWith = JDK11OrLater.class) //
private static final class Target_java_lang_Module_ReflectionData {

@Alias @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.NewInstance, declClassName = "java.lang.WeakPairMap") //
static Target_java_lang_WeakPairMap<Module, Module, Boolean> reads;

@Alias @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.NewInstance, declClassName = "java.lang.WeakPairMap") //
static Target_java_lang_WeakPairMap<Module, Module, Map<String, Boolean>> exports;

@Alias @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.NewInstance, declClassName = "java.lang.WeakPairMap") //
static Target_java_lang_WeakPairMap<Module, Class<?>, Boolean> uses;
}
Expand Down
Loading