OpenJDK / jdk / hs
changeset 46857:6493a9ec5c92
8165896: Use "open" flag from JVM_DefineModule to export all module packages
Summary: Implemented VM side of open modules, which export all their packages unqualifiedly. Automatic modules and unnamed modules are treated internally as open modules.
Reviewed-by: alanb, hseigel, lfoltan
| author | rprotacio |
|---|---|
| date | Mon, 24 Apr 2017 12:08:09 -0400 |
| parents | a2da53348a1a |
| children | 367ce8d9c66f |
| files | jdk/src/java.base/share/classes/java/lang/Module.java |
| diffstat | 1 files changed, 7 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/src/java.base/share/classes/java/lang/Module.java Tue Apr 18 20:31:23 2017 +0200 +++ b/jdk/src/java.base/share/classes/java/lang/Module.java Mon Apr 24 12:08:09 2017 -0400 @@ -126,7 +126,7 @@ // define module to VM - boolean isOpen = descriptor.isOpen(); + boolean isOpen = descriptor.isOpen() || descriptor.isAutomatic(); Version version = descriptor.version().orElse(null); String vs = Objects.toString(version, null); String loc = Objects.toString(uri, null); @@ -1042,9 +1042,6 @@ if (syncVM) { // throws IllegalStateException if defined to another module addPackage0(this, pn); - if (descriptor.isOpen() || descriptor.isAutomatic()) { - addExportsToAll0(this, pn); - } } extraPackages.putIfAbsent(pn, Boolean.TRUE); } @@ -1145,8 +1142,11 @@ m.implAddReads(ALL_UNNAMED_MODULE, true); } - // exports and opens - initExportsAndOpens(m, nameToSource, nameToModule, layer.parents()); + // export and open packages, skipped for open and automatic + // modules since they are treated as if all packages are open + if (!descriptor.isOpen() && !descriptor.isAutomatic()) { + initExportsAndOpens(m, nameToSource, nameToModule, layer.parents()); + } } // register the modules in the boot layer @@ -1207,21 +1207,11 @@ Map<String, Module> nameToSource, Map<String, Module> nameToModule, List<ModuleLayer> parents) { - // The VM doesn't special case open or automatic modules so need to - // export all packages - ModuleDescriptor descriptor = m.getDescriptor(); - if (descriptor.isOpen() || descriptor.isAutomatic()) { - assert descriptor.opens().isEmpty(); - for (String source : descriptor.packages()) { - addExportsToAll0(m, source); - } - return; - } - Map<String, Set<Module>> openPackages = new HashMap<>(); Map<String, Set<Module>> exportedPackages = new HashMap<>(); // process the open packages first + ModuleDescriptor descriptor = m.getDescriptor(); for (Opens opens : descriptor.opens()) { String source = opens.source();