author | jlahoda |
Fri, 12 May 2017 06:42:37 +0200 | |
changeset 45156 | 001f73134346 |
parent 44822 | 2f24758e7ae0 |
child 45217 | 6f188021f8f8 |
child 45682 | fc3b228b9e2a |
permissions | -rw-r--r-- |
36526 | 1 |
/* |
43267 | 2 |
* Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved. |
36526 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
7 |
* published by the Free Software Foundation. Oracle designates this |
|
8 |
* particular file as subject to the "Classpath" exception as provided |
|
9 |
* by Oracle in the LICENSE file that accompanied this code. |
|
10 |
* |
|
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
15 |
* accompanied this code). |
|
16 |
* |
|
17 |
* You should have received a copy of the GNU General Public License version |
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
20 |
* |
|
21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
22 |
* or visit www.oracle.com if you need additional information or have any |
|
23 |
* questions. |
|
24 |
*/ |
|
25 |
||
26 |
||
27 |
package com.sun.tools.javac.comp; |
|
28 |
||
29 |
import java.io.IOException; |
|
30 |
import java.util.Arrays; |
|
31 |
import java.util.Collection; |
|
32 |
import java.util.Collections; |
|
33 |
import java.util.EnumSet; |
|
34 |
import java.util.HashMap; |
|
35 |
import java.util.HashSet; |
|
36 |
import java.util.LinkedHashMap; |
|
37 |
import java.util.LinkedHashSet; |
|
38 |
import java.util.Map; |
|
39 |
import java.util.Set; |
|
39917
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
40 |
import java.util.function.Consumer; |
36526 | 41 |
import java.util.function.Predicate; |
42 |
import java.util.regex.Matcher; |
|
43 |
import java.util.regex.Pattern; |
|
43270
de9a02e20567
8171177: Compiler should issue a warning for incubating modules that are resolved
jlahoda
parents:
43267
diff
changeset
|
44 |
import java.util.stream.Collectors; |
36526 | 45 |
import java.util.stream.Stream; |
46 |
||
47 |
import javax.lang.model.SourceVersion; |
|
48 |
import javax.tools.JavaFileManager; |
|
49 |
import javax.tools.JavaFileManager.Location; |
|
50 |
import javax.tools.JavaFileObject; |
|
51 |
import javax.tools.JavaFileObject.Kind; |
|
52 |
import javax.tools.StandardLocation; |
|
53 |
||
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
54 |
import com.sun.source.tree.ModuleTree.ModuleKind; |
39361
cd0aca7db174
8159439: javac throws NPE with Module attribute and super_class != 0
vromero
parents:
38827
diff
changeset
|
55 |
import com.sun.tools.javac.code.ClassFinder; |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
56 |
import com.sun.tools.javac.code.DeferredLintHandler; |
36526 | 57 |
import com.sun.tools.javac.code.Directive; |
58 |
import com.sun.tools.javac.code.Directive.ExportsDirective; |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
59 |
import com.sun.tools.javac.code.Directive.ExportsFlag; |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
60 |
import com.sun.tools.javac.code.Directive.OpensDirective; |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
61 |
import com.sun.tools.javac.code.Directive.OpensFlag; |
36526 | 62 |
import com.sun.tools.javac.code.Directive.RequiresDirective; |
63 |
import com.sun.tools.javac.code.Directive.RequiresFlag; |
|
64 |
import com.sun.tools.javac.code.Directive.UsesDirective; |
|
65 |
import com.sun.tools.javac.code.Flags; |
|
41938
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
66 |
import com.sun.tools.javac.code.Lint.LintCategory; |
36526 | 67 |
import com.sun.tools.javac.code.ModuleFinder; |
68 |
import com.sun.tools.javac.code.Source; |
|
69 |
import com.sun.tools.javac.code.Symbol; |
|
70 |
import com.sun.tools.javac.code.Symbol.ClassSymbol; |
|
71 |
import com.sun.tools.javac.code.Symbol.Completer; |
|
72 |
import com.sun.tools.javac.code.Symbol.CompletionFailure; |
|
73 |
import com.sun.tools.javac.code.Symbol.MethodSymbol; |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
74 |
import com.sun.tools.javac.code.Symbol.ModuleFlags; |
36526 | 75 |
import com.sun.tools.javac.code.Symbol.ModuleSymbol; |
76 |
import com.sun.tools.javac.code.Symbol.PackageSymbol; |
|
77 |
import com.sun.tools.javac.code.Symtab; |
|
78 |
import com.sun.tools.javac.code.Type; |
|
38827
884d32899770
8152062: obscure error message for bad 'provides'
vromero
parents:
38619
diff
changeset
|
79 |
import com.sun.tools.javac.code.Types; |
36526 | 80 |
import com.sun.tools.javac.jvm.ClassWriter; |
81 |
import com.sun.tools.javac.jvm.JNIWriter; |
|
82 |
import com.sun.tools.javac.main.Option; |
|
83 |
import com.sun.tools.javac.resources.CompilerProperties.Errors; |
|
84 |
import com.sun.tools.javac.resources.CompilerProperties.Warnings; |
|
85 |
import com.sun.tools.javac.tree.JCTree; |
|
86 |
import com.sun.tools.javac.tree.JCTree.JCCompilationUnit; |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
87 |
import com.sun.tools.javac.tree.JCTree.JCDirective; |
36526 | 88 |
import com.sun.tools.javac.tree.JCTree.JCExports; |
89 |
import com.sun.tools.javac.tree.JCTree.JCExpression; |
|
90 |
import com.sun.tools.javac.tree.JCTree.JCModuleDecl; |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
91 |
import com.sun.tools.javac.tree.JCTree.JCOpens; |
36526 | 92 |
import com.sun.tools.javac.tree.JCTree.JCProvides; |
93 |
import com.sun.tools.javac.tree.JCTree.JCRequires; |
|
94 |
import com.sun.tools.javac.tree.JCTree.JCUses; |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
95 |
import com.sun.tools.javac.tree.JCTree.Tag; |
36526 | 96 |
import com.sun.tools.javac.tree.TreeInfo; |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
97 |
import com.sun.tools.javac.util.Abort; |
36526 | 98 |
import com.sun.tools.javac.util.Assert; |
99 |
import com.sun.tools.javac.util.Context; |
|
100 |
import com.sun.tools.javac.util.JCDiagnostic; |
|
101 |
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition; |
|
102 |
import com.sun.tools.javac.util.List; |
|
103 |
import com.sun.tools.javac.util.ListBuffer; |
|
104 |
import com.sun.tools.javac.util.Log; |
|
105 |
import com.sun.tools.javac.util.Name; |
|
106 |
import com.sun.tools.javac.util.Names; |
|
107 |
import com.sun.tools.javac.util.Options; |
|
39361
cd0aca7db174
8159439: javac throws NPE with Module attribute and super_class != 0
vromero
parents:
38827
diff
changeset
|
108 |
import com.sun.tools.javac.util.Position; |
36526 | 109 |
|
110 |
import static com.sun.tools.javac.code.Flags.ABSTRACT; |
|
37854
a76a06106d02
8153268: javac accepts enums being referenced by 'uses' statement
vromero
parents:
37848
diff
changeset
|
111 |
import static com.sun.tools.javac.code.Flags.ENUM; |
36526 | 112 |
import static com.sun.tools.javac.code.Flags.PUBLIC; |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
113 |
import static com.sun.tools.javac.code.Flags.UNATTRIBUTED; |
44290
202973b2d1ae
8176045: No compile error when a package is not declared
jlahoda
parents:
44289
diff
changeset
|
114 |
import com.sun.tools.javac.code.Kinds; |
42841
1768507dae6b
8171412: tools/javac/modules/AddLimitMods.java failed with "error: module not found"
jjg
parents:
42827
diff
changeset
|
115 |
import static com.sun.tools.javac.code.Kinds.Kind.ERR; |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
116 |
import static com.sun.tools.javac.code.Kinds.Kind.MDL; |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
117 |
import static com.sun.tools.javac.code.Kinds.Kind.MTH; |
43270
de9a02e20567
8171177: Compiler should issue a warning for incubating modules that are resolved
jlahoda
parents:
43267
diff
changeset
|
118 |
import com.sun.tools.javac.code.Symbol.ModuleResolutionFlags; |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
119 |
import static com.sun.tools.javac.code.TypeTag.CLASS; |
36526 | 120 |
|
121 |
/** |
|
122 |
* TODO: fill in |
|
123 |
* |
|
124 |
* <p><b>This is NOT part of any supported API. |
|
125 |
* If you write code that depends on this, you do so at your own risk. |
|
126 |
* This code and its internal interfaces are subject to change or |
|
127 |
* deletion without notice.</b> |
|
128 |
*/ |
|
129 |
public class Modules extends JCTree.Visitor { |
|
130 |
private static final String ALL_SYSTEM = "ALL-SYSTEM"; |
|
131 |
private static final String ALL_MODULE_PATH = "ALL-MODULE-PATH"; |
|
132 |
||
133 |
private final Log log; |
|
134 |
private final Names names; |
|
135 |
private final Symtab syms; |
|
136 |
private final Attr attr; |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
137 |
private final Check chk; |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
138 |
private final DeferredLintHandler deferredLintHandler; |
36526 | 139 |
private final TypeEnvs typeEnvs; |
38827
884d32899770
8152062: obscure error message for bad 'provides'
vromero
parents:
38619
diff
changeset
|
140 |
private final Types types; |
36526 | 141 |
private final JavaFileManager fileManager; |
142 |
private final ModuleFinder moduleFinder; |
|
41938
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
143 |
private final Source source; |
36526 | 144 |
private final boolean allowModules; |
45156
001f73134346
8178152: Handling of incubating modules, the jdk.unsupported module and --add-exports with --release <current>
jlahoda
parents:
44822
diff
changeset
|
145 |
private final boolean allowAccessIntoSystem; |
36526 | 146 |
|
147 |
public final boolean multiModuleMode; |
|
148 |
||
43772
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
149 |
private final String legacyModuleOverride; |
36526 | 150 |
|
37848
3c8ff4204d2d
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36526
diff
changeset
|
151 |
private final Name java_se; |
3c8ff4204d2d
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36526
diff
changeset
|
152 |
private final Name java_; |
3c8ff4204d2d
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36526
diff
changeset
|
153 |
|
36526 | 154 |
ModuleSymbol defaultModule; |
155 |
||
156 |
private final String addExportsOpt; |
|
157 |
private Map<ModuleSymbol, Set<ExportsDirective>> addExports; |
|
158 |
private final String addReadsOpt; |
|
159 |
private Map<ModuleSymbol, Set<RequiresDirective>> addReads; |
|
160 |
private final String addModsOpt; |
|
40311
bb76098875c8
8133884: javac moduleName/className and moduleName/packageName options
jlahoda
parents:
40308
diff
changeset
|
161 |
private final Set<String> extraAddMods = new HashSet<>(); |
36526 | 162 |
private final String limitModsOpt; |
40311
bb76098875c8
8133884: javac moduleName/className and moduleName/packageName options
jlahoda
parents:
40308
diff
changeset
|
163 |
private final Set<String> extraLimitMods = new HashSet<>(); |
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42408
diff
changeset
|
164 |
private final String moduleVersionOpt; |
36526 | 165 |
|
41938
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
166 |
private final boolean lintOptions; |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
167 |
|
39917
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
168 |
private Set<ModuleSymbol> rootModules = null; |
43579
0d00f3ea77bc
8172240: javac should not need the transitive closure to compile a module
vromero
parents:
43577
diff
changeset
|
169 |
private final Set<ModuleSymbol> warnedMissing = new HashSet<>(); |
36526 | 170 |
|
44290
202973b2d1ae
8176045: No compile error when a package is not declared
jlahoda
parents:
44289
diff
changeset
|
171 |
public PackageNameFinder findPackageInFile; |
202973b2d1ae
8176045: No compile error when a package is not declared
jlahoda
parents:
44289
diff
changeset
|
172 |
|
36526 | 173 |
public static Modules instance(Context context) { |
174 |
Modules instance = context.get(Modules.class); |
|
175 |
if (instance == null) |
|
176 |
instance = new Modules(context); |
|
177 |
return instance; |
|
178 |
} |
|
179 |
||
180 |
protected Modules(Context context) { |
|
181 |
context.put(Modules.class, this); |
|
182 |
log = Log.instance(context); |
|
183 |
names = Names.instance(context); |
|
184 |
syms = Symtab.instance(context); |
|
185 |
attr = Attr.instance(context); |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
186 |
chk = Check.instance(context); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
187 |
deferredLintHandler = DeferredLintHandler.instance(context); |
36526 | 188 |
typeEnvs = TypeEnvs.instance(context); |
189 |
moduleFinder = ModuleFinder.instance(context); |
|
38827
884d32899770
8152062: obscure error message for bad 'provides'
vromero
parents:
38619
diff
changeset
|
190 |
types = Types.instance(context); |
36526 | 191 |
fileManager = context.get(JavaFileManager.class); |
41938
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
192 |
source = Source.instance(context); |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
193 |
allowModules = source.allowModules(); |
36526 | 194 |
Options options = Options.instance(context); |
195 |
||
45156
001f73134346
8178152: Handling of incubating modules, the jdk.unsupported module and --add-exports with --release <current>
jlahoda
parents:
44822
diff
changeset
|
196 |
allowAccessIntoSystem = options.isUnset(Option.RELEASE); |
41938
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
197 |
lintOptions = options.isUnset(Option.XLINT_CUSTOM, "-" + LintCategory.OPTIONS.option); |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
198 |
|
44812 | 199 |
Collection<String> xmodules = options.keySet() |
200 |
.stream() |
|
201 |
.filter(opt -> opt.startsWith(XMODULES_PREFIX)) |
|
202 |
.map(opt -> opt.substring(XMODULES_PREFIX.length())) |
|
203 |
.collect(Collectors.toList()); |
|
204 |
||
205 |
legacyModuleOverride = xmodules.size() == 1 ? xmodules.iterator().next() : null; |
|
36526 | 206 |
|
207 |
multiModuleMode = fileManager.hasLocation(StandardLocation.MODULE_SOURCE_PATH); |
|
208 |
ClassWriter classWriter = ClassWriter.instance(context); |
|
209 |
classWriter.multiModuleMode = multiModuleMode; |
|
210 |
JNIWriter jniWriter = JNIWriter.instance(context); |
|
211 |
jniWriter.multiModuleMode = multiModuleMode; |
|
212 |
||
37848
3c8ff4204d2d
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36526
diff
changeset
|
213 |
java_se = names.fromString("java.se"); |
3c8ff4204d2d
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36526
diff
changeset
|
214 |
java_ = names.fromString("java."); |
3c8ff4204d2d
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36526
diff
changeset
|
215 |
|
40308
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
39917
diff
changeset
|
216 |
addExportsOpt = options.get(Option.ADD_EXPORTS); |
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
39917
diff
changeset
|
217 |
addReadsOpt = options.get(Option.ADD_READS); |
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
39917
diff
changeset
|
218 |
addModsOpt = options.get(Option.ADD_MODULES); |
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
39917
diff
changeset
|
219 |
limitModsOpt = options.get(Option.LIMIT_MODULES); |
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42408
diff
changeset
|
220 |
moduleVersionOpt = options.get(Option.MODULE_VERSION); |
36526 | 221 |
} |
44812 | 222 |
//where |
223 |
private static final String XMODULES_PREFIX = "-Xmodule:"; |
|
36526 | 224 |
|
225 |
int depth = -1; |
|
226 |
private void dprintln(String msg) { |
|
227 |
for (int i = 0; i < depth; i++) |
|
228 |
System.err.print(" "); |
|
229 |
System.err.println(msg); |
|
230 |
} |
|
231 |
||
40311
bb76098875c8
8133884: javac moduleName/className and moduleName/packageName options
jlahoda
parents:
40308
diff
changeset
|
232 |
public void addExtraAddModules(String... extras) { |
bb76098875c8
8133884: javac moduleName/className and moduleName/packageName options
jlahoda
parents:
40308
diff
changeset
|
233 |
extraAddMods.addAll(Arrays.asList(extras)); |
bb76098875c8
8133884: javac moduleName/className and moduleName/packageName options
jlahoda
parents:
40308
diff
changeset
|
234 |
} |
bb76098875c8
8133884: javac moduleName/className and moduleName/packageName options
jlahoda
parents:
40308
diff
changeset
|
235 |
|
bb76098875c8
8133884: javac moduleName/className and moduleName/packageName options
jlahoda
parents:
40308
diff
changeset
|
236 |
public void addExtraLimitModules(String... extras) { |
bb76098875c8
8133884: javac moduleName/className and moduleName/packageName options
jlahoda
parents:
40308
diff
changeset
|
237 |
extraLimitMods.addAll(Arrays.asList(extras)); |
bb76098875c8
8133884: javac moduleName/className and moduleName/packageName options
jlahoda
parents:
40308
diff
changeset
|
238 |
} |
bb76098875c8
8133884: javac moduleName/className and moduleName/packageName options
jlahoda
parents:
40308
diff
changeset
|
239 |
|
39917
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
240 |
boolean inInitModules; |
40311
bb76098875c8
8133884: javac moduleName/className and moduleName/packageName options
jlahoda
parents:
40308
diff
changeset
|
241 |
public void initModules(List<JCCompilationUnit> trees) { |
39917
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
242 |
Assert.check(!inInitModules); |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
243 |
try { |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
244 |
inInitModules = true; |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
245 |
Assert.checkNull(rootModules); |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
246 |
enter(trees, modules -> { |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
247 |
Assert.checkNull(rootModules); |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
248 |
Assert.checkNull(allModules); |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
249 |
this.rootModules = modules; |
40311
bb76098875c8
8133884: javac moduleName/className and moduleName/packageName options
jlahoda
parents:
40308
diff
changeset
|
250 |
setupAllModules(); //initialize the module graph |
39917
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
251 |
Assert.checkNonNull(allModules); |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
252 |
inInitModules = false; |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
253 |
}, null); |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
254 |
} finally { |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
255 |
inInitModules = false; |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
256 |
} |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
257 |
} |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
258 |
|
36526 | 259 |
public boolean enter(List<JCCompilationUnit> trees, ClassSymbol c) { |
39917
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
260 |
Assert.check(rootModules != null || inInitModules || !allowModules); |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
261 |
return enter(trees, modules -> {}, c); |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
262 |
} |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
263 |
|
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
264 |
private boolean enter(List<JCCompilationUnit> trees, Consumer<Set<ModuleSymbol>> init, ClassSymbol c) { |
38619 | 265 |
if (!allowModules) { |
36526 | 266 |
for (JCCompilationUnit tree: trees) { |
267 |
tree.modle = syms.noModule; |
|
268 |
} |
|
269 |
defaultModule = syms.noModule; |
|
270 |
return true; |
|
271 |
} |
|
272 |
||
273 |
int startErrors = log.nerrors; |
|
274 |
||
275 |
depth++; |
|
276 |
try { |
|
277 |
// scan trees for module defs |
|
278 |
Set<ModuleSymbol> roots = enterModules(trees, c); |
|
279 |
||
42824 | 280 |
setCompilationUnitModules(trees, roots, c); |
36526 | 281 |
|
39917
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
282 |
init.accept(roots); |
36526 | 283 |
|
284 |
for (ModuleSymbol msym: roots) { |
|
285 |
msym.complete(); |
|
286 |
} |
|
39361
cd0aca7db174
8159439: javac throws NPE with Module attribute and super_class != 0
vromero
parents:
38827
diff
changeset
|
287 |
} catch (CompletionFailure ex) { |
cd0aca7db174
8159439: javac throws NPE with Module attribute and super_class != 0
vromero
parents:
38827
diff
changeset
|
288 |
log.error(JCDiagnostic.DiagnosticFlag.NON_DEFERRABLE, Position.NOPOS, "cant.access", ex.sym, ex.getDetailValue()); |
cd0aca7db174
8159439: javac throws NPE with Module attribute and super_class != 0
vromero
parents:
38827
diff
changeset
|
289 |
if (ex instanceof ClassFinder.BadClassFile) throw new Abort(); |
36526 | 290 |
} finally { |
291 |
depth--; |
|
292 |
} |
|
293 |
||
294 |
return (log.nerrors == startErrors); |
|
295 |
} |
|
296 |
||
297 |
public Completer getCompleter() { |
|
298 |
return mainCompleter; |
|
299 |
} |
|
300 |
||
301 |
public ModuleSymbol getDefaultModule() { |
|
302 |
return defaultModule; |
|
303 |
} |
|
304 |
||
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
305 |
public boolean modulesInitialized() { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
306 |
return allModules != null; |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
307 |
} |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
308 |
|
36526 | 309 |
private Set<ModuleSymbol> enterModules(List<JCCompilationUnit> trees, ClassSymbol c) { |
310 |
Set<ModuleSymbol> modules = new LinkedHashSet<>(); |
|
311 |
for (JCCompilationUnit tree : trees) { |
|
312 |
JavaFileObject prev = log.useSource(tree.sourcefile); |
|
313 |
try { |
|
314 |
enterModule(tree, c, modules); |
|
315 |
} finally { |
|
316 |
log.useSource(prev); |
|
317 |
} |
|
318 |
} |
|
319 |
return modules; |
|
320 |
} |
|
321 |
||
322 |
||
323 |
private void enterModule(JCCompilationUnit toplevel, ClassSymbol c, Set<ModuleSymbol> modules) { |
|
324 |
boolean isModuleInfo = toplevel.sourcefile.isNameCompatible("module-info", Kind.SOURCE); |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
325 |
boolean isModuleDecl = toplevel.getModuleDecl() != null; |
41999
dbf796210eff
8168312: javac throws NPE if annotation processor is specified and module is declared in a file named arbitrarily
sadayapalam
parents:
41942
diff
changeset
|
326 |
if (isModuleDecl) { |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
327 |
JCModuleDecl decl = toplevel.getModuleDecl(); |
41999
dbf796210eff
8168312: javac throws NPE if annotation processor is specified and module is declared in a file named arbitrarily
sadayapalam
parents:
41942
diff
changeset
|
328 |
if (!isModuleInfo) { |
dbf796210eff
8168312: javac throws NPE if annotation processor is specified and module is declared in a file named arbitrarily
sadayapalam
parents:
41942
diff
changeset
|
329 |
log.error(decl.pos(), Errors.ModuleDeclSbInModuleInfoJava); |
dbf796210eff
8168312: javac throws NPE if annotation processor is specified and module is declared in a file named arbitrarily
sadayapalam
parents:
41942
diff
changeset
|
330 |
} |
36526 | 331 |
Name name = TreeInfo.fullName(decl.qualId); |
332 |
ModuleSymbol sym; |
|
333 |
if (c != null) { |
|
41254
08f8dbf7741e
8152911: javac assertion error when compiling overlay sources
jlahoda
parents:
40768
diff
changeset
|
334 |
sym = (ModuleSymbol) c.owner; |
08f8dbf7741e
8152911: javac assertion error when compiling overlay sources
jlahoda
parents:
40768
diff
changeset
|
335 |
Assert.checkNonNull(sym.name); |
08f8dbf7741e
8152911: javac assertion error when compiling overlay sources
jlahoda
parents:
40768
diff
changeset
|
336 |
Name treeName = TreeInfo.fullName(decl.qualId); |
08f8dbf7741e
8152911: javac assertion error when compiling overlay sources
jlahoda
parents:
40768
diff
changeset
|
337 |
if (sym.name != treeName) { |
08f8dbf7741e
8152911: javac assertion error when compiling overlay sources
jlahoda
parents:
40768
diff
changeset
|
338 |
log.error(decl.pos(), Errors.ModuleNameMismatch(name, sym.name)); |
08f8dbf7741e
8152911: javac assertion error when compiling overlay sources
jlahoda
parents:
40768
diff
changeset
|
339 |
} |
36526 | 340 |
} else { |
341 |
sym = syms.enterModule(name); |
|
342 |
if (sym.module_info.sourcefile != null && sym.module_info.sourcefile != toplevel.sourcefile) { |
|
343 |
log.error(decl.pos(), Errors.DuplicateModule(sym)); |
|
344 |
return; |
|
345 |
} |
|
346 |
} |
|
347 |
sym.completer = getSourceCompleter(toplevel); |
|
348 |
sym.module_info.sourcefile = toplevel.sourcefile; |
|
349 |
decl.sym = sym; |
|
350 |
||
351 |
if (multiModuleMode || modules.isEmpty()) { |
|
352 |
modules.add(sym); |
|
353 |
} else { |
|
354 |
log.error(toplevel.pos(), Errors.TooManyModules); |
|
355 |
} |
|
356 |
||
357 |
Env<AttrContext> provisionalEnv = new Env<>(decl, null); |
|
358 |
||
359 |
provisionalEnv.toplevel = toplevel; |
|
360 |
typeEnvs.put(sym, provisionalEnv); |
|
361 |
} else if (isModuleInfo) { |
|
362 |
if (multiModuleMode) { |
|
363 |
JCTree tree = toplevel.defs.isEmpty() ? toplevel : toplevel.defs.head; |
|
364 |
log.error(tree.pos(), Errors.ExpectedModule); |
|
365 |
} |
|
366 |
} |
|
367 |
} |
|
368 |
||
42824 | 369 |
private void setCompilationUnitModules(List<JCCompilationUnit> trees, Set<ModuleSymbol> rootModules, ClassSymbol c) { |
36526 | 370 |
// update the module for each compilation unit |
371 |
if (multiModuleMode) { |
|
372 |
checkNoAllModulePath(); |
|
373 |
for (JCCompilationUnit tree: trees) { |
|
374 |
if (tree.defs.isEmpty()) { |
|
375 |
tree.modle = syms.unnamedModule; |
|
376 |
continue; |
|
377 |
} |
|
378 |
||
379 |
JavaFileObject prev = log.useSource(tree.sourcefile); |
|
380 |
try { |
|
43772
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
381 |
Location msplocn = getModuleLocation(tree); |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
382 |
Location plocn = fileManager.hasLocation(StandardLocation.PATCH_MODULE_PATH) ? |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
383 |
fileManager.getLocationForModule(StandardLocation.PATCH_MODULE_PATH, |
44063
5f0cf4126949
8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents:
43865
diff
changeset
|
384 |
tree.sourcefile) : |
43772
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
385 |
null; |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
386 |
|
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
387 |
if (plocn != null) { |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
388 |
Name name = names.fromString(fileManager.inferModuleName(plocn)); |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
389 |
ModuleSymbol msym = moduleFinder.findModule(name); |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
390 |
tree.modle = msym; |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
391 |
rootModules.add(msym); |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
392 |
|
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
393 |
if (msplocn != null) { |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
394 |
Name mspname = names.fromString(fileManager.inferModuleName(msplocn)); |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
395 |
if (name != mspname) { |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
396 |
log.error(tree.pos(), Errors.FilePatchedAndMsp(name, mspname)); |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
397 |
} |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
398 |
} |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
399 |
} else if (msplocn != null) { |
44063
5f0cf4126949
8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents:
43865
diff
changeset
|
400 |
if (tree.getModuleDecl() != null) { |
5f0cf4126949
8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents:
43865
diff
changeset
|
401 |
JavaFileObject canonical = |
5f0cf4126949
8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents:
43865
diff
changeset
|
402 |
fileManager.getJavaFileForInput(msplocn, "module-info", Kind.SOURCE); |
5f0cf4126949
8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents:
43865
diff
changeset
|
403 |
if (canonical == null || !fileManager.isSameFile(canonical, tree.sourcefile)) { |
5f0cf4126949
8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents:
43865
diff
changeset
|
404 |
log.error(tree.pos(), Errors.ModuleNotFoundOnModuleSourcePath); |
5f0cf4126949
8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents:
43865
diff
changeset
|
405 |
} |
5f0cf4126949
8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents:
43865
diff
changeset
|
406 |
} |
43772
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
407 |
Name name = names.fromString(fileManager.inferModuleName(msplocn)); |
36526 | 408 |
ModuleSymbol msym; |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
409 |
JCModuleDecl decl = tree.getModuleDecl(); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
410 |
if (decl != null) { |
36526 | 411 |
msym = decl.sym; |
412 |
if (msym.name != name) { |
|
413 |
log.error(decl.qualId, Errors.ModuleNameMismatch(msym.name, name)); |
|
414 |
} |
|
415 |
} else { |
|
43267 | 416 |
if (tree.getPackage() == null) { |
417 |
log.error(tree.pos(), Errors.UnnamedPkgNotAllowedNamedModules); |
|
418 |
} |
|
36526 | 419 |
msym = syms.enterModule(name); |
420 |
} |
|
421 |
if (msym.sourceLocation == null) { |
|
43772
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
422 |
msym.sourceLocation = msplocn; |
44289
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
44063
diff
changeset
|
423 |
if (fileManager.hasLocation(StandardLocation.PATCH_MODULE_PATH)) { |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
44063
diff
changeset
|
424 |
msym.patchLocation = fileManager.getLocationForModule( |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
44063
diff
changeset
|
425 |
StandardLocation.PATCH_MODULE_PATH, msym.name.toString()); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
44063
diff
changeset
|
426 |
} |
36526 | 427 |
if (fileManager.hasLocation(StandardLocation.CLASS_OUTPUT)) { |
44289
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
44063
diff
changeset
|
428 |
Location outputLocn = fileManager.getLocationForModule( |
36526 | 429 |
StandardLocation.CLASS_OUTPUT, msym.name.toString()); |
44289
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
44063
diff
changeset
|
430 |
if (msym.patchLocation == null) { |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
44063
diff
changeset
|
431 |
msym.classLocation = outputLocn; |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
44063
diff
changeset
|
432 |
} else { |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
44063
diff
changeset
|
433 |
msym.patchOutputLocation = outputLocn; |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
44063
diff
changeset
|
434 |
} |
36526 | 435 |
} |
436 |
} |
|
437 |
tree.modle = msym; |
|
438 |
rootModules.add(msym); |
|
42824 | 439 |
} else if (c != null && c.packge().modle == syms.unnamedModule) { |
440 |
tree.modle = syms.unnamedModule; |
|
36526 | 441 |
} else { |
43267 | 442 |
if (tree.getModuleDecl() != null) { |
443 |
log.error(tree.pos(), Errors.ModuleNotFoundOnModuleSourcePath); |
|
444 |
} else { |
|
445 |
log.error(tree.pos(), Errors.NotInModuleOnModuleSourcePath); |
|
446 |
} |
|
36526 | 447 |
tree.modle = syms.errModule; |
448 |
} |
|
449 |
} catch (IOException e) { |
|
450 |
throw new Error(e); // FIXME |
|
451 |
} finally { |
|
452 |
log.useSource(prev); |
|
453 |
} |
|
454 |
} |
|
455 |
if (syms.unnamedModule.sourceLocation == null) { |
|
456 |
syms.unnamedModule.completer = getUnnamedModuleCompleter(); |
|
457 |
syms.unnamedModule.sourceLocation = StandardLocation.SOURCE_PATH; |
|
458 |
syms.unnamedModule.classLocation = StandardLocation.CLASS_PATH; |
|
459 |
} |
|
460 |
defaultModule = syms.unnamedModule; |
|
461 |
} else { |
|
43772
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
462 |
ModuleSymbol module = null; |
36526 | 463 |
if (defaultModule == null) { |
43772
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
464 |
String moduleOverride = singleModuleOverride(trees); |
36526 | 465 |
switch (rootModules.size()) { |
466 |
case 0: |
|
467 |
defaultModule = moduleFinder.findSingleModule(); |
|
468 |
if (defaultModule == syms.unnamedModule) { |
|
469 |
if (moduleOverride != null) { |
|
470 |
checkNoAllModulePath(); |
|
471 |
defaultModule = moduleFinder.findModule(names.fromString(moduleOverride)); |
|
43772
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
472 |
if (legacyModuleOverride != null) { |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
473 |
defaultModule.sourceLocation = StandardLocation.SOURCE_PATH; |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
474 |
} |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
475 |
defaultModule.patchOutputLocation = StandardLocation.CLASS_OUTPUT; |
36526 | 476 |
} else { |
477 |
// Question: why not do findAllModules and initVisiblePackages here? |
|
478 |
// i.e. body of unnamedModuleCompleter |
|
479 |
defaultModule.completer = getUnnamedModuleCompleter(); |
|
43772
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
480 |
defaultModule.sourceLocation = StandardLocation.SOURCE_PATH; |
36526 | 481 |
defaultModule.classLocation = StandardLocation.CLASS_PATH; |
482 |
} |
|
483 |
} else { |
|
484 |
checkNoAllModulePath(); |
|
485 |
defaultModule.complete(); |
|
486 |
// Question: why not do completeModule here? |
|
42827
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42824
diff
changeset
|
487 |
defaultModule.completer = sym -> completeModule((ModuleSymbol) sym); |
43772
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
488 |
defaultModule.sourceLocation = StandardLocation.SOURCE_PATH; |
36526 | 489 |
} |
490 |
rootModules.add(defaultModule); |
|
491 |
break; |
|
492 |
case 1: |
|
493 |
checkNoAllModulePath(); |
|
494 |
defaultModule = rootModules.iterator().next(); |
|
43772
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
495 |
defaultModule.sourceLocation = StandardLocation.SOURCE_PATH; |
44289
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
44063
diff
changeset
|
496 |
if (fileManager.hasLocation(StandardLocation.PATCH_MODULE_PATH)) { |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
44063
diff
changeset
|
497 |
try { |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
44063
diff
changeset
|
498 |
defaultModule.patchLocation = fileManager.getLocationForModule( |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
44063
diff
changeset
|
499 |
StandardLocation.PATCH_MODULE_PATH, defaultModule.name.toString()); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
44063
diff
changeset
|
500 |
} catch (IOException ex) { |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
44063
diff
changeset
|
501 |
throw new Error(ex); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
44063
diff
changeset
|
502 |
} |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
44063
diff
changeset
|
503 |
} |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
44063
diff
changeset
|
504 |
if (defaultModule.patchLocation == null) { |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
44063
diff
changeset
|
505 |
defaultModule.classLocation = StandardLocation.CLASS_OUTPUT; |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
44063
diff
changeset
|
506 |
} else { |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
44063
diff
changeset
|
507 |
defaultModule.patchOutputLocation = StandardLocation.CLASS_OUTPUT; |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
44063
diff
changeset
|
508 |
} |
36526 | 509 |
break; |
510 |
default: |
|
511 |
Assert.error("too many modules"); |
|
512 |
} |
|
44289
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
44063
diff
changeset
|
513 |
} else if (rootModules.size() == 1) { |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
44063
diff
changeset
|
514 |
module = rootModules.iterator().next(); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
44063
diff
changeset
|
515 |
module.complete(); |
842ccb558d7d
8175057: module-info on patch path should not produce an error
jlahoda
parents:
44063
diff
changeset
|
516 |
module.completer = sym -> completeModule((ModuleSymbol) sym); |
36526 | 517 |
} else { |
518 |
Assert.check(rootModules.isEmpty()); |
|
43772
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
519 |
String moduleOverride = singleModuleOverride(trees); |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
520 |
if (moduleOverride != null) { |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
521 |
module = moduleFinder.findModule(names.fromString(moduleOverride)); |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
522 |
} else { |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
523 |
module = defaultModule; |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
524 |
} |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
525 |
rootModules.add(module); |
36526 | 526 |
} |
527 |
||
528 |
if (defaultModule != syms.unnamedModule) { |
|
529 |
syms.unnamedModule.completer = getUnnamedModuleCompleter(); |
|
530 |
syms.unnamedModule.classLocation = StandardLocation.CLASS_PATH; |
|
531 |
} |
|
532 |
||
43772
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
533 |
if (module == null) { |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
534 |
module = defaultModule; |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
535 |
} |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
536 |
|
44822 | 537 |
for (JCCompilationUnit tree : trees) { |
538 |
if (defaultModule != syms.unnamedModule |
|
539 |
&& defaultModule.sourceLocation == StandardLocation.SOURCE_PATH |
|
540 |
&& fileManager.hasLocation(StandardLocation.SOURCE_PATH)) { |
|
541 |
checkSourceLocation(tree, module); |
|
542 |
} |
|
43772
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
543 |
tree.modle = module; |
36526 | 544 |
} |
545 |
} |
|
546 |
} |
|
547 |
||
44822 | 548 |
private void checkSourceLocation(JCCompilationUnit tree, ModuleSymbol msym) { |
549 |
// skip check if legacy module override still in use |
|
550 |
if (legacyModuleOverride != null) { |
|
551 |
return; |
|
552 |
} |
|
553 |
||
554 |
try { |
|
555 |
JavaFileObject fo = tree.sourcefile; |
|
556 |
if (fileManager.contains(msym.sourceLocation, fo)) { |
|
557 |
return; |
|
558 |
} |
|
559 |
if (msym.patchLocation != null && fileManager.contains(msym.patchLocation, fo)) { |
|
560 |
return; |
|
561 |
} |
|
562 |
if (fileManager.hasLocation(StandardLocation.SOURCE_OUTPUT)) { |
|
563 |
if (fileManager.contains(StandardLocation.SOURCE_OUTPUT, fo)) { |
|
564 |
return; |
|
565 |
} |
|
566 |
} else { |
|
567 |
if (fileManager.contains(StandardLocation.CLASS_OUTPUT, fo)) { |
|
568 |
return; |
|
569 |
} |
|
570 |
} |
|
571 |
} catch (IOException e) { |
|
572 |
throw new Error(e); |
|
573 |
} |
|
574 |
||
575 |
JavaFileObject prev = log.useSource(tree.sourcefile); |
|
576 |
try { |
|
577 |
log.error(tree.pos(), "file.sb.on.source.or.patch.path.for.module"); |
|
578 |
} finally { |
|
579 |
log.useSource(prev); |
|
580 |
} |
|
581 |
} |
|
582 |
||
43772
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
583 |
private String singleModuleOverride(List<JCCompilationUnit> trees) { |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
584 |
if (!fileManager.hasLocation(StandardLocation.PATCH_MODULE_PATH)) { |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
585 |
return legacyModuleOverride; |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
586 |
} |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
587 |
|
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
588 |
Set<String> override = new LinkedHashSet<>(); |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
589 |
for (JCCompilationUnit tree : trees) { |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
590 |
JavaFileObject fo = tree.sourcefile; |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
591 |
|
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
592 |
try { |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
593 |
Location loc = |
44063
5f0cf4126949
8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents:
43865
diff
changeset
|
594 |
fileManager.getLocationForModule(StandardLocation.PATCH_MODULE_PATH, fo); |
43772
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
595 |
|
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
596 |
if (loc != null) { |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
597 |
override.add(fileManager.inferModuleName(loc)); |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
598 |
} |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
599 |
} catch (IOException ex) { |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
600 |
throw new Error(ex); |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
601 |
} |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
602 |
} |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
603 |
|
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
604 |
switch (override.size()) { |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
605 |
case 0: return legacyModuleOverride; |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
606 |
case 1: return override.iterator().next(); |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
607 |
default: |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
608 |
log.error(Errors.TooManyPatchedModules(override)); |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
609 |
return null; |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
610 |
} |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
611 |
} |
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
612 |
|
43267 | 613 |
/** |
614 |
* Determine the location for the module on the module source path |
|
615 |
* or source output directory which contains a given CompilationUnit. |
|
616 |
* If the source output directory is unset, the class output directory |
|
617 |
* will be checked instead. |
|
618 |
* {@code null} is returned if no such module can be found. |
|
619 |
* @param tree the compilation unit tree |
|
620 |
* @return the location for the enclosing module |
|
621 |
* @throws IOException if there is a problem while searching for the module. |
|
622 |
*/ |
|
36526 | 623 |
private Location getModuleLocation(JCCompilationUnit tree) throws IOException { |
43267 | 624 |
JavaFileObject fo = tree.sourcefile; |
625 |
||
42815
050370edaade
8072988: Update javax.annotation.processing for modules
jlahoda
parents:
42408
diff
changeset
|
626 |
Location loc = |
44063
5f0cf4126949
8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents:
43865
diff
changeset
|
627 |
fileManager.getLocationForModule(StandardLocation.MODULE_SOURCE_PATH, fo); |
42815
050370edaade
8072988: Update javax.annotation.processing for modules
jlahoda
parents:
42408
diff
changeset
|
628 |
if (loc == null) { |
050370edaade
8072988: Update javax.annotation.processing for modules
jlahoda
parents:
42408
diff
changeset
|
629 |
Location sourceOutput = fileManager.hasLocation(StandardLocation.SOURCE_OUTPUT) ? |
050370edaade
8072988: Update javax.annotation.processing for modules
jlahoda
parents:
42408
diff
changeset
|
630 |
StandardLocation.SOURCE_OUTPUT : StandardLocation.CLASS_OUTPUT; |
050370edaade
8072988: Update javax.annotation.processing for modules
jlahoda
parents:
42408
diff
changeset
|
631 |
loc = |
44063
5f0cf4126949
8175560: Drop String pkgName from javax.tools.JavaFileManager.getLocationForModule(Location location, JavaFileObject fo, String pkgName)
jlahoda
parents:
43865
diff
changeset
|
632 |
fileManager.getLocationForModule(sourceOutput, fo); |
42815
050370edaade
8072988: Update javax.annotation.processing for modules
jlahoda
parents:
42408
diff
changeset
|
633 |
} |
050370edaade
8072988: Update javax.annotation.processing for modules
jlahoda
parents:
42408
diff
changeset
|
634 |
return loc; |
36526 | 635 |
} |
636 |
||
637 |
private void checkNoAllModulePath() { |
|
638 |
if (addModsOpt != null && Arrays.asList(addModsOpt.split(",")).contains(ALL_MODULE_PATH)) { |
|
639 |
log.error(Errors.AddmodsAllModulePathInvalid); |
|
640 |
} |
|
641 |
} |
|
642 |
||
643 |
private final Completer mainCompleter = new Completer() { |
|
644 |
@Override |
|
645 |
public void complete(Symbol sym) throws CompletionFailure { |
|
646 |
ModuleSymbol msym = moduleFinder.findModule((ModuleSymbol) sym); |
|
647 |
||
42841
1768507dae6b
8171412: tools/javac/modules/AddLimitMods.java failed with "error: module not found"
jjg
parents:
42827
diff
changeset
|
648 |
if (msym.kind == ERR) { |
36526 | 649 |
//make sure the module is initialized: |
650 |
msym.directives = List.nil(); |
|
651 |
msym.exports = List.nil(); |
|
652 |
msym.provides = List.nil(); |
|
653 |
msym.requires = List.nil(); |
|
654 |
msym.uses = List.nil(); |
|
655 |
} else if ((msym.flags_field & Flags.AUTOMATIC_MODULE) != 0) { |
|
39917
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
656 |
setupAutomaticModule(msym); |
36526 | 657 |
} else { |
658 |
msym.module_info.complete(); |
|
659 |
} |
|
660 |
||
661 |
// If module-info comes from a .java file, the underlying |
|
662 |
// call of classFinder.fillIn will have called through the |
|
663 |
// source completer, to Enter, and then to Modules.enter, |
|
664 |
// which will call completeModule. |
|
665 |
// But, if module-info comes from a .class file, the underlying |
|
666 |
// call of classFinder.fillIn will just call ClassReader to read |
|
667 |
// the .class file, and so we call completeModule here. |
|
668 |
if (msym.module_info.classfile == null || msym.module_info.classfile.getKind() == Kind.CLASS) { |
|
669 |
completeModule(msym); |
|
670 |
} |
|
671 |
} |
|
672 |
||
673 |
@Override |
|
674 |
public String toString() { |
|
675 |
return "mainCompleter"; |
|
676 |
} |
|
677 |
}; |
|
678 |
||
39917
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
679 |
private void setupAutomaticModule(ModuleSymbol msym) throws CompletionFailure { |
36526 | 680 |
try { |
681 |
ListBuffer<Directive> directives = new ListBuffer<>(); |
|
682 |
ListBuffer<ExportsDirective> exports = new ListBuffer<>(); |
|
683 |
Set<String> seenPackages = new HashSet<>(); |
|
684 |
||
685 |
for (JavaFileObject clazz : fileManager.list(msym.classLocation, "", EnumSet.of(Kind.CLASS), true)) { |
|
686 |
String binName = fileManager.inferBinaryName(msym.classLocation, clazz); |
|
687 |
String pack = binName.lastIndexOf('.') != (-1) ? binName.substring(0, binName.lastIndexOf('.')) : ""; //unnamed package???? |
|
688 |
if (seenPackages.add(pack)) { |
|
689 |
ExportsDirective d = new ExportsDirective(syms.enterPackage(msym, names.fromString(pack)), null); |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
690 |
//TODO: opens? |
36526 | 691 |
directives.add(d); |
692 |
exports.add(d); |
|
693 |
} |
|
694 |
} |
|
695 |
||
696 |
msym.exports = exports.toList(); |
|
697 |
msym.provides = List.nil(); |
|
39917
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
698 |
msym.requires = List.nil(); |
36526 | 699 |
msym.uses = List.nil(); |
700 |
msym.directives = directives.toList(); |
|
701 |
msym.flags_field |= Flags.ACYCLIC; |
|
702 |
} catch (IOException ex) { |
|
703 |
throw new IllegalStateException(ex); |
|
704 |
} |
|
705 |
} |
|
706 |
||
39917
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
707 |
private void completeAutomaticModule(ModuleSymbol msym) throws CompletionFailure { |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
708 |
ListBuffer<Directive> directives = new ListBuffer<>(); |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
709 |
|
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
710 |
directives.addAll(msym.directives); |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
711 |
|
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
712 |
ListBuffer<RequiresDirective> requires = new ListBuffer<>(); |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
713 |
|
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
714 |
for (ModuleSymbol ms : allModules()) { |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
715 |
if (ms == syms.unnamedModule || ms == msym) |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
716 |
continue; |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
717 |
Set<RequiresFlag> flags = (ms.flags_field & Flags.AUTOMATIC_MODULE) != 0 ? |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
718 |
EnumSet.of(RequiresFlag.TRANSITIVE) : EnumSet.noneOf(RequiresFlag.class); |
39917
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
719 |
RequiresDirective d = new RequiresDirective(ms, flags); |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
720 |
directives.add(d); |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
721 |
requires.add(d); |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
722 |
} |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
723 |
|
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
724 |
RequiresDirective requiresUnnamed = new RequiresDirective(syms.unnamedModule); |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
725 |
directives.add(requiresUnnamed); |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
726 |
requires.add(requiresUnnamed); |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
727 |
|
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
728 |
msym.requires = requires.toList(); |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
729 |
msym.directives = directives.toList(); |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
730 |
} |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
731 |
|
36526 | 732 |
private Completer getSourceCompleter(JCCompilationUnit tree) { |
733 |
return new Completer() { |
|
734 |
@Override |
|
735 |
public void complete(Symbol sym) throws CompletionFailure { |
|
736 |
ModuleSymbol msym = (ModuleSymbol) sym; |
|
737 |
msym.flags_field |= UNATTRIBUTED; |
|
738 |
ModuleVisitor v = new ModuleVisitor(); |
|
739 |
JavaFileObject prev = log.useSource(tree.sourcefile); |
|
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42408
diff
changeset
|
740 |
JCModuleDecl moduleDecl = tree.getModuleDecl(); |
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42408
diff
changeset
|
741 |
DiagnosticPosition prevLintPos = deferredLintHandler.setPos(moduleDecl.pos()); |
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42408
diff
changeset
|
742 |
|
36526 | 743 |
try { |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
744 |
moduleDecl.accept(v); |
36526 | 745 |
completeModule(msym); |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
746 |
checkCyclicDependencies(moduleDecl); |
36526 | 747 |
} finally { |
748 |
log.useSource(prev); |
|
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42408
diff
changeset
|
749 |
deferredLintHandler.setPos(prevLintPos); |
36526 | 750 |
msym.flags_field &= ~UNATTRIBUTED; |
751 |
} |
|
752 |
} |
|
753 |
||
754 |
@Override |
|
755 |
public String toString() { |
|
756 |
return "SourceCompleter: " + tree.sourcefile.getName(); |
|
757 |
} |
|
758 |
||
759 |
}; |
|
760 |
} |
|
761 |
||
42815
050370edaade
8072988: Update javax.annotation.processing for modules
jlahoda
parents:
42408
diff
changeset
|
762 |
public boolean isRootModule(ModuleSymbol module) { |
050370edaade
8072988: Update javax.annotation.processing for modules
jlahoda
parents:
42408
diff
changeset
|
763 |
Assert.checkNonNull(rootModules); |
050370edaade
8072988: Update javax.annotation.processing for modules
jlahoda
parents:
42408
diff
changeset
|
764 |
return rootModules.contains(module); |
050370edaade
8072988: Update javax.annotation.processing for modules
jlahoda
parents:
42408
diff
changeset
|
765 |
} |
050370edaade
8072988: Update javax.annotation.processing for modules
jlahoda
parents:
42408
diff
changeset
|
766 |
|
44291
e1b620ac6c98
8175119: Need to specify module of types created by Filer.createSourceFile/Filer.createClassFile?
jlahoda
parents:
44290
diff
changeset
|
767 |
public Set<ModuleSymbol> getRootModules() { |
e1b620ac6c98
8175119: Need to specify module of types created by Filer.createSourceFile/Filer.createClassFile?
jlahoda
parents:
44290
diff
changeset
|
768 |
Assert.checkNonNull(rootModules); |
e1b620ac6c98
8175119: Need to specify module of types created by Filer.createSourceFile/Filer.createClassFile?
jlahoda
parents:
44290
diff
changeset
|
769 |
return rootModules; |
e1b620ac6c98
8175119: Need to specify module of types created by Filer.createSourceFile/Filer.createClassFile?
jlahoda
parents:
44290
diff
changeset
|
770 |
} |
e1b620ac6c98
8175119: Need to specify module of types created by Filer.createSourceFile/Filer.createClassFile?
jlahoda
parents:
44290
diff
changeset
|
771 |
|
36526 | 772 |
class ModuleVisitor extends JCTree.Visitor { |
773 |
private ModuleSymbol sym; |
|
774 |
private final Set<ModuleSymbol> allRequires = new HashSet<>(); |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
775 |
private final Map<PackageSymbol,List<ExportsDirective>> allExports = new HashMap<>(); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
776 |
private final Map<PackageSymbol,List<OpensDirective>> allOpens = new HashMap<>(); |
36526 | 777 |
|
778 |
@Override |
|
779 |
public void visitModuleDef(JCModuleDecl tree) { |
|
780 |
sym = Assert.checkNonNull(tree.sym); |
|
781 |
||
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
782 |
if (tree.getModuleType() == ModuleKind.OPEN) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
783 |
sym.flags.add(ModuleFlags.OPEN); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
784 |
} |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
785 |
sym.flags_field |= (tree.mods.flags & Flags.DEPRECATED); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
786 |
|
36526 | 787 |
sym.requires = List.nil(); |
788 |
sym.exports = List.nil(); |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
789 |
sym.opens = List.nil(); |
36526 | 790 |
tree.directives.forEach(t -> t.accept(this)); |
791 |
sym.requires = sym.requires.reverse(); |
|
792 |
sym.exports = sym.exports.reverse(); |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
793 |
sym.opens = sym.opens.reverse(); |
36526 | 794 |
ensureJavaBase(); |
795 |
} |
|
796 |
||
797 |
@Override |
|
798 |
public void visitRequires(JCRequires tree) { |
|
799 |
ModuleSymbol msym = lookupModule(tree.moduleName); |
|
800 |
if (msym.kind != MDL) { |
|
801 |
log.error(tree.moduleName.pos(), Errors.ModuleNotFound(msym)); |
|
43579
0d00f3ea77bc
8172240: javac should not need the transitive closure to compile a module
vromero
parents:
43577
diff
changeset
|
802 |
warnedMissing.add(msym); |
36526 | 803 |
} else if (allRequires.contains(msym)) { |
804 |
log.error(tree.moduleName.pos(), Errors.DuplicateRequires(msym)); |
|
805 |
} else { |
|
806 |
allRequires.add(msym); |
|
807 |
Set<RequiresFlag> flags = EnumSet.noneOf(RequiresFlag.class); |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
808 |
if (tree.isTransitive) |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
809 |
flags.add(RequiresFlag.TRANSITIVE); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
810 |
if (tree.isStaticPhase) |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
811 |
flags.add(RequiresFlag.STATIC_PHASE); |
36526 | 812 |
RequiresDirective d = new RequiresDirective(msym, flags); |
813 |
tree.directive = d; |
|
814 |
sym.requires = sym.requires.prepend(d); |
|
815 |
} |
|
816 |
} |
|
817 |
||
818 |
@Override |
|
819 |
public void visitExports(JCExports tree) { |
|
820 |
Name name = TreeInfo.fullName(tree.qualid); |
|
821 |
PackageSymbol packge = syms.enterPackage(sym, name); |
|
822 |
attr.setPackageSymbols(tree.qualid, packge); |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
823 |
|
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
824 |
List<ExportsDirective> exportsForPackage = allExports.computeIfAbsent(packge, p -> List.nil()); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
825 |
for (ExportsDirective d : exportsForPackage) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
826 |
reportExportsConflict(tree, packge); |
36526 | 827 |
} |
828 |
||
829 |
List<ModuleSymbol> toModules = null; |
|
830 |
if (tree.moduleNames != null) { |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
831 |
Set<ModuleSymbol> to = new LinkedHashSet<>(); |
36526 | 832 |
for (JCExpression n: tree.moduleNames) { |
833 |
ModuleSymbol msym = lookupModule(n); |
|
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42408
diff
changeset
|
834 |
chk.checkModuleExists(n.pos(), msym); |
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42408
diff
changeset
|
835 |
for (ExportsDirective d : exportsForPackage) { |
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42408
diff
changeset
|
836 |
checkDuplicateExportsToModule(n, msym, d); |
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42408
diff
changeset
|
837 |
} |
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42408
diff
changeset
|
838 |
if (!to.add(msym)) { |
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42408
diff
changeset
|
839 |
reportExportsConflictToModule(n, msym); |
36526 | 840 |
} |
841 |
} |
|
842 |
toModules = List.from(to); |
|
843 |
} |
|
844 |
||
845 |
if (toModules == null || !toModules.isEmpty()) { |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
846 |
Set<ExportsFlag> flags = EnumSet.noneOf(ExportsFlag.class); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
847 |
ExportsDirective d = new ExportsDirective(packge, toModules, flags); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
848 |
sym.exports = sym.exports.prepend(d); |
36526 | 849 |
tree.directive = d; |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
850 |
|
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
851 |
allExports.put(packge, exportsForPackage.prepend(d)); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
852 |
} |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
853 |
} |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
854 |
|
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
855 |
private void reportExportsConflict(JCExports tree, PackageSymbol packge) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
856 |
log.error(tree.qualid.pos(), Errors.ConflictingExports(packge)); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
857 |
} |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
858 |
|
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
859 |
private void checkDuplicateExportsToModule(JCExpression name, ModuleSymbol msym, |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
860 |
ExportsDirective d) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
861 |
if (d.modules != null) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
862 |
for (ModuleSymbol other : d.modules) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
863 |
if (msym == other) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
864 |
reportExportsConflictToModule(name, msym); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
865 |
} |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
866 |
} |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
867 |
} |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
868 |
} |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
869 |
|
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
870 |
private void reportExportsConflictToModule(JCExpression name, ModuleSymbol msym) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
871 |
log.error(name.pos(), Errors.ConflictingExportsToModule(msym)); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
872 |
} |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
873 |
|
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
874 |
@Override |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
875 |
public void visitOpens(JCOpens tree) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
876 |
Name name = TreeInfo.fullName(tree.qualid); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
877 |
PackageSymbol packge = syms.enterPackage(sym, name); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
878 |
attr.setPackageSymbols(tree.qualid, packge); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
879 |
|
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
880 |
if (sym.flags.contains(ModuleFlags.OPEN)) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
881 |
log.error(tree.pos(), Errors.NoOpensUnlessStrong); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
882 |
} |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
883 |
List<OpensDirective> opensForPackage = allOpens.computeIfAbsent(packge, p -> List.nil()); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
884 |
for (OpensDirective d : opensForPackage) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
885 |
reportOpensConflict(tree, packge); |
36526 | 886 |
} |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
887 |
|
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
888 |
List<ModuleSymbol> toModules = null; |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
889 |
if (tree.moduleNames != null) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
890 |
Set<ModuleSymbol> to = new LinkedHashSet<>(); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
891 |
for (JCExpression n: tree.moduleNames) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
892 |
ModuleSymbol msym = lookupModule(n); |
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42408
diff
changeset
|
893 |
chk.checkModuleExists(n.pos(), msym); |
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42408
diff
changeset
|
894 |
for (OpensDirective d : opensForPackage) { |
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42408
diff
changeset
|
895 |
checkDuplicateOpensToModule(n, msym, d); |
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42408
diff
changeset
|
896 |
} |
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42408
diff
changeset
|
897 |
if (!to.add(msym)) { |
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42408
diff
changeset
|
898 |
reportOpensConflictToModule(n, msym); |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
899 |
} |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
900 |
} |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
901 |
toModules = List.from(to); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
902 |
} |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
903 |
|
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
904 |
if (toModules == null || !toModules.isEmpty()) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
905 |
Set<OpensFlag> flags = EnumSet.noneOf(OpensFlag.class); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
906 |
OpensDirective d = new OpensDirective(packge, toModules, flags); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
907 |
sym.opens = sym.opens.prepend(d); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
908 |
tree.directive = d; |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
909 |
|
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
910 |
allOpens.put(packge, opensForPackage.prepend(d)); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
911 |
} |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
912 |
} |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
913 |
|
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
914 |
private void reportOpensConflict(JCOpens tree, PackageSymbol packge) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
915 |
log.error(tree.qualid.pos(), Errors.ConflictingOpens(packge)); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
916 |
} |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
917 |
|
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
918 |
private void checkDuplicateOpensToModule(JCExpression name, ModuleSymbol msym, |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
919 |
OpensDirective d) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
920 |
if (d.modules != null) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
921 |
for (ModuleSymbol other : d.modules) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
922 |
if (msym == other) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
923 |
reportOpensConflictToModule(name, msym); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
924 |
} |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
925 |
} |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
926 |
} |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
927 |
} |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
928 |
|
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
929 |
private void reportOpensConflictToModule(JCExpression name, ModuleSymbol msym) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
930 |
log.error(name.pos(), Errors.ConflictingOpensToModule(msym)); |
36526 | 931 |
} |
932 |
||
933 |
@Override |
|
934 |
public void visitProvides(JCProvides tree) { } |
|
935 |
||
936 |
@Override |
|
937 |
public void visitUses(JCUses tree) { } |
|
938 |
||
939 |
private void ensureJavaBase() { |
|
940 |
if (sym.name == names.java_base) |
|
941 |
return; |
|
942 |
||
943 |
for (RequiresDirective d: sym.requires) { |
|
944 |
if (d.module.name == names.java_base) |
|
945 |
return; |
|
946 |
} |
|
947 |
||
948 |
ModuleSymbol java_base = syms.enterModule(names.java_base); |
|
949 |
Directive.RequiresDirective d = |
|
950 |
new Directive.RequiresDirective(java_base, |
|
951 |
EnumSet.of(Directive.RequiresFlag.MANDATED)); |
|
952 |
sym.requires = sym.requires.prepend(d); |
|
953 |
} |
|
954 |
||
955 |
private ModuleSymbol lookupModule(JCExpression moduleName) { |
|
956 |
Name name = TreeInfo.fullName(moduleName); |
|
957 |
ModuleSymbol msym = moduleFinder.findModule(name); |
|
958 |
TreeInfo.setSymbol(moduleName, msym); |
|
959 |
return msym; |
|
960 |
} |
|
961 |
} |
|
962 |
||
963 |
public Completer getUsesProvidesCompleter() { |
|
964 |
return sym -> { |
|
965 |
ModuleSymbol msym = (ModuleSymbol) sym; |
|
39917
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
966 |
|
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
967 |
msym.complete(); |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
968 |
|
36526 | 969 |
Env<AttrContext> env = typeEnvs.get(msym); |
970 |
UsesProvidesVisitor v = new UsesProvidesVisitor(msym, env); |
|
971 |
JavaFileObject prev = log.useSource(env.toplevel.sourcefile); |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
972 |
JCModuleDecl decl = env.toplevel.getModuleDecl(); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
973 |
DiagnosticPosition prevLintPos = deferredLintHandler.setPos(decl.pos()); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
974 |
|
36526 | 975 |
try { |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
976 |
decl.accept(v); |
36526 | 977 |
} finally { |
978 |
log.useSource(prev); |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
979 |
deferredLintHandler.setPos(prevLintPos); |
36526 | 980 |
} |
981 |
}; |
|
982 |
} |
|
983 |
||
984 |
class UsesProvidesVisitor extends JCTree.Visitor { |
|
985 |
private final ModuleSymbol msym; |
|
986 |
private final Env<AttrContext> env; |
|
987 |
||
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
988 |
private final Set<ClassSymbol> allUses = new HashSet<>(); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
989 |
private final Map<ClassSymbol, Set<ClassSymbol>> allProvides = new HashMap<>(); |
36526 | 990 |
|
991 |
public UsesProvidesVisitor(ModuleSymbol msym, Env<AttrContext> env) { |
|
992 |
this.msym = msym; |
|
993 |
this.env = env; |
|
994 |
} |
|
995 |
||
996 |
@Override @SuppressWarnings("unchecked") |
|
997 |
public void visitModuleDef(JCModuleDecl tree) { |
|
998 |
msym.directives = List.nil(); |
|
999 |
msym.provides = List.nil(); |
|
1000 |
msym.uses = List.nil(); |
|
1001 |
tree.directives.forEach(t -> t.accept(this)); |
|
1002 |
msym.directives = msym.directives.reverse(); |
|
1003 |
msym.provides = msym.provides.reverse(); |
|
1004 |
msym.uses = msym.uses.reverse(); |
|
1005 |
||
1006 |
if (msym.requires.nonEmpty() && msym.requires.head.flags.contains(RequiresFlag.MANDATED)) |
|
1007 |
msym.directives = msym.directives.prepend(msym.requires.head); |
|
1008 |
||
1009 |
msym.directives = msym.directives.appendList(List.from(addReads.getOrDefault(msym, Collections.emptySet()))); |
|
1010 |
||
1011 |
checkForCorrectness(); |
|
1012 |
} |
|
1013 |
||
1014 |
@Override |
|
1015 |
public void visitExports(JCExports tree) { |
|
44290
202973b2d1ae
8176045: No compile error when a package is not declared
jlahoda
parents:
44289
diff
changeset
|
1016 |
Iterable<Symbol> packageContent = tree.directive.packge.members().getSymbols(); |
202973b2d1ae
8176045: No compile error when a package is not declared
jlahoda
parents:
44289
diff
changeset
|
1017 |
List<JavaFileObject> filesToCheck = List.nil(); |
202973b2d1ae
8176045: No compile error when a package is not declared
jlahoda
parents:
44289
diff
changeset
|
1018 |
boolean packageNotEmpty = false; |
202973b2d1ae
8176045: No compile error when a package is not declared
jlahoda
parents:
44289
diff
changeset
|
1019 |
for (Symbol sym : packageContent) { |
202973b2d1ae
8176045: No compile error when a package is not declared
jlahoda
parents:
44289
diff
changeset
|
1020 |
if (sym.kind != Kinds.Kind.TYP) |
202973b2d1ae
8176045: No compile error when a package is not declared
jlahoda
parents:
44289
diff
changeset
|
1021 |
continue; |
202973b2d1ae
8176045: No compile error when a package is not declared
jlahoda
parents:
44289
diff
changeset
|
1022 |
ClassSymbol csym = (ClassSymbol) sym; |
202973b2d1ae
8176045: No compile error when a package is not declared
jlahoda
parents:
44289
diff
changeset
|
1023 |
if (sym.completer.isTerminal() || |
202973b2d1ae
8176045: No compile error when a package is not declared
jlahoda
parents:
44289
diff
changeset
|
1024 |
csym.classfile.getKind() == Kind.CLASS) { |
202973b2d1ae
8176045: No compile error when a package is not declared
jlahoda
parents:
44289
diff
changeset
|
1025 |
packageNotEmpty = true; |
202973b2d1ae
8176045: No compile error when a package is not declared
jlahoda
parents:
44289
diff
changeset
|
1026 |
filesToCheck = List.nil(); |
202973b2d1ae
8176045: No compile error when a package is not declared
jlahoda
parents:
44289
diff
changeset
|
1027 |
break; |
202973b2d1ae
8176045: No compile error when a package is not declared
jlahoda
parents:
44289
diff
changeset
|
1028 |
} |
202973b2d1ae
8176045: No compile error when a package is not declared
jlahoda
parents:
44289
diff
changeset
|
1029 |
if (csym.classfile.getKind() == Kind.SOURCE) { |
202973b2d1ae
8176045: No compile error when a package is not declared
jlahoda
parents:
44289
diff
changeset
|
1030 |
filesToCheck = filesToCheck.prepend(csym.classfile); |
202973b2d1ae
8176045: No compile error when a package is not declared
jlahoda
parents:
44289
diff
changeset
|
1031 |
} |
202973b2d1ae
8176045: No compile error when a package is not declared
jlahoda
parents:
44289
diff
changeset
|
1032 |
} |
202973b2d1ae
8176045: No compile error when a package is not declared
jlahoda
parents:
44289
diff
changeset
|
1033 |
for (JavaFileObject jfo : filesToCheck) { |
202973b2d1ae
8176045: No compile error when a package is not declared
jlahoda
parents:
44289
diff
changeset
|
1034 |
if (findPackageInFile.findPackageNameOf(jfo) == tree.directive.packge.fullname) { |
202973b2d1ae
8176045: No compile error when a package is not declared
jlahoda
parents:
44289
diff
changeset
|
1035 |
packageNotEmpty = true; |
202973b2d1ae
8176045: No compile error when a package is not declared
jlahoda
parents:
44289
diff
changeset
|
1036 |
break; |
202973b2d1ae
8176045: No compile error when a package is not declared
jlahoda
parents:
44289
diff
changeset
|
1037 |
} |
202973b2d1ae
8176045: No compile error when a package is not declared
jlahoda
parents:
44289
diff
changeset
|
1038 |
} |
202973b2d1ae
8176045: No compile error when a package is not declared
jlahoda
parents:
44289
diff
changeset
|
1039 |
if (!packageNotEmpty) { |
36526 | 1040 |
log.error(tree.qualid.pos(), Errors.PackageEmptyOrNotFound(tree.directive.packge)); |
1041 |
} |
|
1042 |
msym.directives = msym.directives.prepend(tree.directive); |
|
1043 |
} |
|
1044 |
||
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1045 |
@Override |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1046 |
public void visitOpens(JCOpens tree) { |
43588
6a0e0ea0e93b
8172901: javac: 'opens' statement cannot specify non observable package
jjg
parents:
43579
diff
changeset
|
1047 |
chk.checkPackageExistsForOpens(tree.qualid, tree.directive.packge); |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1048 |
msym.directives = msym.directives.prepend(tree.directive); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1049 |
} |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1050 |
|
36526 | 1051 |
MethodSymbol noArgsConstructor(ClassSymbol tsym) { |
1052 |
for (Symbol sym : tsym.members().getSymbolsByName(names.init)) { |
|
1053 |
MethodSymbol mSym = (MethodSymbol)sym; |
|
1054 |
if (mSym.params().isEmpty()) { |
|
1055 |
return mSym; |
|
1056 |
} |
|
1057 |
} |
|
1058 |
return null; |
|
1059 |
} |
|
1060 |
||
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1061 |
MethodSymbol factoryMethod(ClassSymbol tsym) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1062 |
for (Symbol sym : tsym.members().getSymbolsByName(names.provider, sym -> sym.kind == MTH)) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1063 |
MethodSymbol mSym = (MethodSymbol)sym; |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1064 |
if (mSym.isStatic() && (mSym.flags() & Flags.PUBLIC) != 0 && mSym.params().isEmpty()) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1065 |
return mSym; |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1066 |
} |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1067 |
} |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1068 |
return null; |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1069 |
} |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1070 |
|
36526 | 1071 |
Map<Directive.ProvidesDirective, JCProvides> directiveToTreeMap = new HashMap<>(); |
1072 |
||
1073 |
@Override |
|
1074 |
public void visitProvides(JCProvides tree) { |
|
1075 |
Type st = attr.attribType(tree.serviceName, env, syms.objectType); |
|
1076 |
ClassSymbol service = (ClassSymbol) st.tsym; |
|
43577
1a1b1242f7aa
8172807: Javac doesn't report errors on duplicate provides with different service implementations
jjg
parents:
43271
diff
changeset
|
1077 |
if (allProvides.containsKey(service)) { |
1a1b1242f7aa
8172807: Javac doesn't report errors on duplicate provides with different service implementations
jjg
parents:
43271
diff
changeset
|
1078 |
log.error(tree.serviceName.pos(), Errors.RepeatedProvidesForService(service)); |
1a1b1242f7aa
8172807: Javac doesn't report errors on duplicate provides with different service implementations
jjg
parents:
43271
diff
changeset
|
1079 |
} |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1080 |
ListBuffer<ClassSymbol> impls = new ListBuffer<>(); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1081 |
for (JCExpression implName : tree.implNames) { |
43865
532c50fea155
8174243: incorrect error message for nested service provider
vromero
parents:
43772
diff
changeset
|
1082 |
Type it; |
532c50fea155
8174243: incorrect error message for nested service provider
vromero
parents:
43772
diff
changeset
|
1083 |
boolean prevVisitingServiceImplementation = env.info.visitingServiceImplementation; |
532c50fea155
8174243: incorrect error message for nested service provider
vromero
parents:
43772
diff
changeset
|
1084 |
try { |
532c50fea155
8174243: incorrect error message for nested service provider
vromero
parents:
43772
diff
changeset
|
1085 |
env.info.visitingServiceImplementation = true; |
532c50fea155
8174243: incorrect error message for nested service provider
vromero
parents:
43772
diff
changeset
|
1086 |
it = attr.attribType(implName, env, syms.objectType); |
532c50fea155
8174243: incorrect error message for nested service provider
vromero
parents:
43772
diff
changeset
|
1087 |
} finally { |
532c50fea155
8174243: incorrect error message for nested service provider
vromero
parents:
43772
diff
changeset
|
1088 |
env.info.visitingServiceImplementation = prevVisitingServiceImplementation; |
532c50fea155
8174243: incorrect error message for nested service provider
vromero
parents:
43772
diff
changeset
|
1089 |
} |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1090 |
ClassSymbol impl = (ClassSymbol) it.tsym; |
43865
532c50fea155
8174243: incorrect error message for nested service provider
vromero
parents:
43772
diff
changeset
|
1091 |
if ((impl.flags_field & PUBLIC) == 0) { |
532c50fea155
8174243: incorrect error message for nested service provider
vromero
parents:
43772
diff
changeset
|
1092 |
log.error(implName.pos(), Errors.NotDefPublic(impl, impl.location())); |
532c50fea155
8174243: incorrect error message for nested service provider
vromero
parents:
43772
diff
changeset
|
1093 |
} |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1094 |
//find provider factory: |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1095 |
MethodSymbol factory = factoryMethod(impl); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1096 |
if (factory != null) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1097 |
Type returnType = factory.type.getReturnType(); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1098 |
if (!types.isSubtype(returnType, st)) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1099 |
log.error(implName.pos(), Errors.ServiceImplementationProviderReturnMustBeSubtypeOfServiceInterface); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1100 |
} |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1101 |
} else { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1102 |
if (!types.isSubtype(it, st)) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1103 |
log.error(implName.pos(), Errors.ServiceImplementationMustBeSubtypeOfServiceInterface); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1104 |
} else if ((impl.flags() & ABSTRACT) != 0) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1105 |
log.error(implName.pos(), Errors.ServiceImplementationIsAbstract(impl)); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1106 |
} else if (impl.isInner()) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1107 |
log.error(implName.pos(), Errors.ServiceImplementationIsInner(impl)); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1108 |
} else { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1109 |
MethodSymbol constr = noArgsConstructor(impl); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1110 |
if (constr == null) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1111 |
log.error(implName.pos(), Errors.ServiceImplementationDoesntHaveANoArgsConstructor(impl)); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1112 |
} else if ((constr.flags() & PUBLIC) == 0) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1113 |
log.error(implName.pos(), Errors.ServiceImplementationNoArgsConstructorNotPublic(impl)); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1114 |
} |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1115 |
} |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1116 |
} |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1117 |
if (it.hasTag(CLASS)) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1118 |
if (allProvides.computeIfAbsent(service, s -> new HashSet<>()).add(impl)) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1119 |
impls.append(impl); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1120 |
} else { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1121 |
log.error(implName.pos(), Errors.DuplicateProvides(service, impl)); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1122 |
} |
36526 | 1123 |
} |
1124 |
} |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1125 |
if (st.hasTag(CLASS) && !impls.isEmpty()) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1126 |
Directive.ProvidesDirective d = new Directive.ProvidesDirective(service, impls.toList()); |
36526 | 1127 |
msym.provides = msym.provides.prepend(d); |
1128 |
msym.directives = msym.directives.prepend(d); |
|
1129 |
directiveToTreeMap.put(d, tree); |
|
1130 |
} |
|
1131 |
} |
|
1132 |
||
1133 |
@Override |
|
1134 |
public void visitRequires(JCRequires tree) { |
|
43271
ce89609dde7c
8172809: Error compiling javafx modules after fix for JDK-8169197
jlahoda
parents:
43270
diff
changeset
|
1135 |
if (tree.directive != null && allModules().contains(tree.directive.module)) { |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1136 |
chk.checkDeprecated(tree.moduleName.pos(), msym, tree.directive.module); |
44576 | 1137 |
chk.checkModuleRequires(tree.moduleName.pos(), tree.directive); |
39915
5d1e0740e709
8158224: NullPointerException in com.sun.tools.javac.comp.Modules.checkCyclicDependencies when module missing
sadayapalam
parents:
39366
diff
changeset
|
1138 |
msym.directives = msym.directives.prepend(tree.directive); |
5d1e0740e709
8158224: NullPointerException in com.sun.tools.javac.comp.Modules.checkCyclicDependencies when module missing
sadayapalam
parents:
39366
diff
changeset
|
1139 |
} |
36526 | 1140 |
} |
1141 |
||
1142 |
@Override |
|
1143 |
public void visitUses(JCUses tree) { |
|
1144 |
Type st = attr.attribType(tree.qualid, env, syms.objectType); |
|
37854
a76a06106d02
8153268: javac accepts enums being referenced by 'uses' statement
vromero
parents:
37848
diff
changeset
|
1145 |
Symbol sym = TreeInfo.symbol(tree.qualid); |
a76a06106d02
8153268: javac accepts enums being referenced by 'uses' statement
vromero
parents:
37848
diff
changeset
|
1146 |
if ((sym.flags() & ENUM) != 0) { |
a76a06106d02
8153268: javac accepts enums being referenced by 'uses' statement
vromero
parents:
37848
diff
changeset
|
1147 |
log.error(tree.qualid.pos(), Errors.ServiceDefinitionIsEnum(st.tsym)); |
a76a06106d02
8153268: javac accepts enums being referenced by 'uses' statement
vromero
parents:
37848
diff
changeset
|
1148 |
} else if (st.hasTag(CLASS)) { |
36526 | 1149 |
ClassSymbol service = (ClassSymbol) st.tsym; |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1150 |
if (allUses.add(service)) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1151 |
Directive.UsesDirective d = new Directive.UsesDirective(service); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1152 |
msym.uses = msym.uses.prepend(d); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1153 |
msym.directives = msym.directives.prepend(d); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1154 |
} else { |
36526 | 1155 |
log.error(tree.pos(), Errors.DuplicateUses(service)); |
1156 |
} |
|
1157 |
} |
|
1158 |
} |
|
1159 |
||
1160 |
private void checkForCorrectness() { |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1161 |
for (Directive.ProvidesDirective provides : msym.provides) { |
36526 | 1162 |
JCProvides tree = directiveToTreeMap.get(provides); |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1163 |
for (ClassSymbol impl : provides.impls) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1164 |
/* The implementation must be defined in the same module as the provides directive |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1165 |
* (else, error) |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1166 |
*/ |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1167 |
PackageSymbol implementationDefiningPackage = impl.packge(); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1168 |
if (implementationDefiningPackage.modle != msym) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1169 |
// TODO: should use tree for the implentation name, not the entire provides tree |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1170 |
// TODO: should improve error message to identify the implementation type |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1171 |
log.error(tree.pos(), Errors.ServiceImplementationNotInRightModule(implementationDefiningPackage.modle)); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1172 |
} |
36526 | 1173 |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1174 |
/* There is no inherent requirement that module that provides a service should actually |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1175 |
* use it itself. However, it is a pointless declaration if the service package is not |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1176 |
* exported and there is no uses for the service. |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1177 |
*/ |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1178 |
PackageSymbol interfaceDeclaringPackage = provides.service.packge(); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1179 |
boolean isInterfaceDeclaredInCurrentModule = interfaceDeclaringPackage.modle == msym; |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1180 |
boolean isInterfaceExportedFromAReadableModule = |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1181 |
msym.visiblePackages.get(interfaceDeclaringPackage.fullname) == interfaceDeclaringPackage; |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1182 |
if (isInterfaceDeclaredInCurrentModule && !isInterfaceExportedFromAReadableModule) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1183 |
// ok the interface is declared in this module. Let's check if it's exported |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1184 |
boolean warn = true; |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1185 |
for (ExportsDirective export : msym.exports) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1186 |
if (interfaceDeclaringPackage == export.packge) { |
36526 | 1187 |
warn = false; |
1188 |
break; |
|
1189 |
} |
|
1190 |
} |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1191 |
if (warn) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1192 |
for (UsesDirective uses : msym.uses) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1193 |
if (provides.service == uses.service) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1194 |
warn = false; |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1195 |
break; |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1196 |
} |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1197 |
} |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1198 |
} |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1199 |
if (warn) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1200 |
log.warning(tree.pos(), Warnings.ServiceProvidedButNotExportedOrUsed(provides.service)); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1201 |
} |
36526 | 1202 |
} |
1203 |
} |
|
1204 |
} |
|
1205 |
} |
|
1206 |
} |
|
1207 |
||
39917
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
1208 |
private Set<ModuleSymbol> allModules; |
36526 | 1209 |
|
39917
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
1210 |
public Set<ModuleSymbol> allModules() { |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
1211 |
Assert.checkNonNull(allModules); |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
1212 |
return allModules; |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
1213 |
} |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
1214 |
|
40311
bb76098875c8
8133884: javac moduleName/className and moduleName/packageName options
jlahoda
parents:
40308
diff
changeset
|
1215 |
private void setupAllModules() { |
39917
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
1216 |
Assert.checkNonNull(rootModules); |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
1217 |
Assert.checkNull(allModules); |
36526 | 1218 |
|
1219 |
Set<ModuleSymbol> observable; |
|
1220 |
||
39917
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
1221 |
if (limitModsOpt == null && extraLimitMods.isEmpty()) { |
36526 | 1222 |
observable = null; |
1223 |
} else { |
|
1224 |
Set<ModuleSymbol> limitMods = new HashSet<>(); |
|
39917
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
1225 |
if (limitModsOpt != null) { |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
1226 |
for (String limit : limitModsOpt.split(",")) { |
41938
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1227 |
if (!isValidName(limit)) |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1228 |
continue; |
39917
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
1229 |
limitMods.add(syms.enterModule(names.fromString(limit))); |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
1230 |
} |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
1231 |
} |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
1232 |
for (String limit : extraLimitMods) { |
36526 | 1233 |
limitMods.add(syms.enterModule(names.fromString(limit))); |
1234 |
} |
|
45156
001f73134346
8178152: Handling of incubating modules, the jdk.unsupported module and --add-exports with --release <current>
jlahoda
parents:
44822
diff
changeset
|
1235 |
observable = computeTransitiveClosure(limitMods, rootModules, null); |
36526 | 1236 |
observable.addAll(rootModules); |
41938
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1237 |
if (lintOptions) { |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1238 |
for (ModuleSymbol msym : limitMods) { |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1239 |
if (!observable.contains(msym)) { |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1240 |
log.warning(LintCategory.OPTIONS, |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1241 |
Warnings.ModuleForOptionNotFound(Option.LIMIT_MODULES, msym)); |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1242 |
} |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1243 |
} |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1244 |
} |
36526 | 1245 |
} |
1246 |
||
42841
1768507dae6b
8171412: tools/javac/modules/AddLimitMods.java failed with "error: module not found"
jjg
parents:
42827
diff
changeset
|
1247 |
Predicate<ModuleSymbol> observablePred = sym -> |
1768507dae6b
8171412: tools/javac/modules/AddLimitMods.java failed with "error: module not found"
jjg
parents:
42827
diff
changeset
|
1248 |
(observable == null) ? (moduleFinder.findModule(sym).kind != ERR) : observable.contains(sym); |
36526 | 1249 |
Predicate<ModuleSymbol> systemModulePred = sym -> (sym.flags() & Flags.SYSTEM_MODULE) != 0; |
43270
de9a02e20567
8171177: Compiler should issue a warning for incubating modules that are resolved
jlahoda
parents:
43267
diff
changeset
|
1250 |
Predicate<ModuleSymbol> noIncubatorPred = sym -> { |
de9a02e20567
8171177: Compiler should issue a warning for incubating modules that are resolved
jlahoda
parents:
43267
diff
changeset
|
1251 |
sym.complete(); |
de9a02e20567
8171177: Compiler should issue a warning for incubating modules that are resolved
jlahoda
parents:
43267
diff
changeset
|
1252 |
return !sym.resolutionFlags.contains(ModuleResolutionFlags.DO_NOT_RESOLVE_BY_DEFAULT); |
de9a02e20567
8171177: Compiler should issue a warning for incubating modules that are resolved
jlahoda
parents:
43267
diff
changeset
|
1253 |
}; |
36526 | 1254 |
Set<ModuleSymbol> enabledRoot = new LinkedHashSet<>(); |
1255 |
||
1256 |
if (rootModules.contains(syms.unnamedModule)) { |
|
37848
3c8ff4204d2d
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36526
diff
changeset
|
1257 |
ModuleSymbol javaSE = syms.getModule(java_se); |
3c8ff4204d2d
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36526
diff
changeset
|
1258 |
Predicate<ModuleSymbol> jdkModulePred; |
3c8ff4204d2d
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36526
diff
changeset
|
1259 |
|
3c8ff4204d2d
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36526
diff
changeset
|
1260 |
if (javaSE != null && (observable == null || observable.contains(javaSE))) { |
3c8ff4204d2d
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36526
diff
changeset
|
1261 |
jdkModulePred = sym -> { |
3c8ff4204d2d
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36526
diff
changeset
|
1262 |
sym.complete(); |
3c8ff4204d2d
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36526
diff
changeset
|
1263 |
return !sym.name.startsWith(java_) |
3c8ff4204d2d
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36526
diff
changeset
|
1264 |
&& sym.exports.stream().anyMatch(e -> e.modules == null); |
3c8ff4204d2d
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36526
diff
changeset
|
1265 |
}; |
3c8ff4204d2d
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36526
diff
changeset
|
1266 |
enabledRoot.add(javaSE); |
3c8ff4204d2d
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36526
diff
changeset
|
1267 |
} else { |
3c8ff4204d2d
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36526
diff
changeset
|
1268 |
jdkModulePred = sym -> true; |
3c8ff4204d2d
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36526
diff
changeset
|
1269 |
} |
3c8ff4204d2d
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36526
diff
changeset
|
1270 |
|
3c8ff4204d2d
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36526
diff
changeset
|
1271 |
for (ModuleSymbol sym : new HashSet<>(syms.getAllModules())) { |
43270
de9a02e20567
8171177: Compiler should issue a warning for incubating modules that are resolved
jlahoda
parents:
43267
diff
changeset
|
1272 |
if (systemModulePred.test(sym) && observablePred.test(sym) && jdkModulePred.test(sym) && noIncubatorPred.test(sym)) { |
36526 | 1273 |
enabledRoot.add(sym); |
1274 |
} |
|
1275 |
} |
|
1276 |
} |
|
1277 |
||
1278 |
enabledRoot.addAll(rootModules); |
|
1279 |
||
39917
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
1280 |
if (addModsOpt != null || !extraAddMods.isEmpty()) { |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
1281 |
Set<String> fullAddMods = new HashSet<>(); |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
1282 |
fullAddMods.addAll(extraAddMods); |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
1283 |
|
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
1284 |
if (addModsOpt != null) { |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
1285 |
fullAddMods.addAll(Arrays.asList(addModsOpt.split(","))); |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
1286 |
} |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
1287 |
|
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
1288 |
for (String added : fullAddMods) { |
36526 | 1289 |
Stream<ModuleSymbol> modules; |
1290 |
switch (added) { |
|
1291 |
case ALL_SYSTEM: |
|
43270
de9a02e20567
8171177: Compiler should issue a warning for incubating modules that are resolved
jlahoda
parents:
43267
diff
changeset
|
1292 |
modules = new HashSet<>(syms.getAllModules()) |
de9a02e20567
8171177: Compiler should issue a warning for incubating modules that are resolved
jlahoda
parents:
43267
diff
changeset
|
1293 |
.stream() |
44573
245bb4e6f983
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44291
diff
changeset
|
1294 |
.filter(systemModulePred.and(observablePred)); |
36526 | 1295 |
break; |
1296 |
case ALL_MODULE_PATH: |
|
43270
de9a02e20567
8171177: Compiler should issue a warning for incubating modules that are resolved
jlahoda
parents:
43267
diff
changeset
|
1297 |
modules = new HashSet<>(syms.getAllModules()) |
de9a02e20567
8171177: Compiler should issue a warning for incubating modules that are resolved
jlahoda
parents:
43267
diff
changeset
|
1298 |
.stream() |
de9a02e20567
8171177: Compiler should issue a warning for incubating modules that are resolved
jlahoda
parents:
43267
diff
changeset
|
1299 |
.filter(systemModulePred.negate().and(observablePred)); |
36526 | 1300 |
break; |
1301 |
default: |
|
41938
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1302 |
if (!isValidName(added)) |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1303 |
continue; |
36526 | 1304 |
modules = Stream.of(syms.enterModule(names.fromString(added))); |
1305 |
break; |
|
1306 |
} |
|
1307 |
modules.forEach(sym -> { |
|
1308 |
enabledRoot.add(sym); |
|
1309 |
if (observable != null) |
|
1310 |
observable.add(sym); |
|
1311 |
}); |
|
1312 |
} |
|
1313 |
} |
|
1314 |
||
45156
001f73134346
8178152: Handling of incubating modules, the jdk.unsupported module and --add-exports with --release <current>
jlahoda
parents:
44822
diff
changeset
|
1315 |
Set<ModuleSymbol> result = computeTransitiveClosure(enabledRoot, rootModules, observable); |
36526 | 1316 |
|
1317 |
result.add(syms.unnamedModule); |
|
1318 |
||
44573
245bb4e6f983
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44291
diff
changeset
|
1319 |
boolean hasAutomatic = result.stream().anyMatch(IS_AUTOMATIC); |
245bb4e6f983
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44291
diff
changeset
|
1320 |
|
245bb4e6f983
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44291
diff
changeset
|
1321 |
if (hasAutomatic) { |
245bb4e6f983
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44291
diff
changeset
|
1322 |
syms.getAllModules() |
245bb4e6f983
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44291
diff
changeset
|
1323 |
.stream() |
245bb4e6f983
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44291
diff
changeset
|
1324 |
.filter(IS_AUTOMATIC) |
245bb4e6f983
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44291
diff
changeset
|
1325 |
.forEach(result::add); |
245bb4e6f983
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44291
diff
changeset
|
1326 |
} |
245bb4e6f983
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44291
diff
changeset
|
1327 |
|
43270
de9a02e20567
8171177: Compiler should issue a warning for incubating modules that are resolved
jlahoda
parents:
43267
diff
changeset
|
1328 |
String incubatingModules = result.stream() |
de9a02e20567
8171177: Compiler should issue a warning for incubating modules that are resolved
jlahoda
parents:
43267
diff
changeset
|
1329 |
.filter(msym -> msym.resolutionFlags.contains(ModuleResolutionFlags.WARN_INCUBATING)) |
de9a02e20567
8171177: Compiler should issue a warning for incubating modules that are resolved
jlahoda
parents:
43267
diff
changeset
|
1330 |
.map(msym -> msym.name.toString()) |
de9a02e20567
8171177: Compiler should issue a warning for incubating modules that are resolved
jlahoda
parents:
43267
diff
changeset
|
1331 |
.collect(Collectors.joining(",")); |
de9a02e20567
8171177: Compiler should issue a warning for incubating modules that are resolved
jlahoda
parents:
43267
diff
changeset
|
1332 |
|
de9a02e20567
8171177: Compiler should issue a warning for incubating modules that are resolved
jlahoda
parents:
43267
diff
changeset
|
1333 |
if (!incubatingModules.isEmpty()) { |
de9a02e20567
8171177: Compiler should issue a warning for incubating modules that are resolved
jlahoda
parents:
43267
diff
changeset
|
1334 |
log.warning(Warnings.IncubatingModules(incubatingModules)); |
de9a02e20567
8171177: Compiler should issue a warning for incubating modules that are resolved
jlahoda
parents:
43267
diff
changeset
|
1335 |
} |
de9a02e20567
8171177: Compiler should issue a warning for incubating modules that are resolved
jlahoda
parents:
43267
diff
changeset
|
1336 |
|
39917
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
1337 |
allModules = result; |
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42408
diff
changeset
|
1338 |
|
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42408
diff
changeset
|
1339 |
//add module versions from options, if any: |
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42408
diff
changeset
|
1340 |
if (moduleVersionOpt != null) { |
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42408
diff
changeset
|
1341 |
Name version = names.fromString(moduleVersionOpt); |
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42408
diff
changeset
|
1342 |
rootModules.forEach(m -> m.version = version); |
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42408
diff
changeset
|
1343 |
} |
36526 | 1344 |
} |
44573
245bb4e6f983
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44291
diff
changeset
|
1345 |
//where: |
245bb4e6f983
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44291
diff
changeset
|
1346 |
private static final Predicate<ModuleSymbol> IS_AUTOMATIC = |
245bb4e6f983
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44291
diff
changeset
|
1347 |
m -> (m.flags_field & Flags.AUTOMATIC_MODULE) != 0; |
36526 | 1348 |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1349 |
public boolean isInModuleGraph(ModuleSymbol msym) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1350 |
return allModules == null || allModules.contains(msym); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1351 |
} |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1352 |
|
45156
001f73134346
8178152: Handling of incubating modules, the jdk.unsupported module and --add-exports with --release <current>
jlahoda
parents:
44822
diff
changeset
|
1353 |
private Set<ModuleSymbol> computeTransitiveClosure(Set<? extends ModuleSymbol> base, |
001f73134346
8178152: Handling of incubating modules, the jdk.unsupported module and --add-exports with --release <current>
jlahoda
parents:
44822
diff
changeset
|
1354 |
Set<? extends ModuleSymbol> rootModules, |
001f73134346
8178152: Handling of incubating modules, the jdk.unsupported module and --add-exports with --release <current>
jlahoda
parents:
44822
diff
changeset
|
1355 |
Set<ModuleSymbol> observable) { |
43579
0d00f3ea77bc
8172240: javac should not need the transitive closure to compile a module
vromero
parents:
43577
diff
changeset
|
1356 |
List<ModuleSymbol> primaryTodo = List.nil(); |
0d00f3ea77bc
8172240: javac should not need the transitive closure to compile a module
vromero
parents:
43577
diff
changeset
|
1357 |
List<ModuleSymbol> secondaryTodo = List.nil(); |
36526 | 1358 |
|
1359 |
for (ModuleSymbol ms : base) { |
|
45156
001f73134346
8178152: Handling of incubating modules, the jdk.unsupported module and --add-exports with --release <current>
jlahoda
parents:
44822
diff
changeset
|
1360 |
if (rootModules.contains(ms)) { |
001f73134346
8178152: Handling of incubating modules, the jdk.unsupported module and --add-exports with --release <current>
jlahoda
parents:
44822
diff
changeset
|
1361 |
primaryTodo = primaryTodo.prepend(ms); |
001f73134346
8178152: Handling of incubating modules, the jdk.unsupported module and --add-exports with --release <current>
jlahoda
parents:
44822
diff
changeset
|
1362 |
} else { |
001f73134346
8178152: Handling of incubating modules, the jdk.unsupported module and --add-exports with --release <current>
jlahoda
parents:
44822
diff
changeset
|
1363 |
secondaryTodo = secondaryTodo.prepend(ms); |
001f73134346
8178152: Handling of incubating modules, the jdk.unsupported module and --add-exports with --release <current>
jlahoda
parents:
44822
diff
changeset
|
1364 |
} |
36526 | 1365 |
} |
1366 |
||
1367 |
Set<ModuleSymbol> result = new LinkedHashSet<>(); |
|
1368 |
result.add(syms.java_base); |
|
1369 |
||
43579
0d00f3ea77bc
8172240: javac should not need the transitive closure to compile a module
vromero
parents:
43577
diff
changeset
|
1370 |
while (primaryTodo.nonEmpty() || secondaryTodo.nonEmpty()) { |
0d00f3ea77bc
8172240: javac should not need the transitive closure to compile a module
vromero
parents:
43577
diff
changeset
|
1371 |
ModuleSymbol current; |
0d00f3ea77bc
8172240: javac should not need the transitive closure to compile a module
vromero
parents:
43577
diff
changeset
|
1372 |
boolean isPrimaryTodo; |
0d00f3ea77bc
8172240: javac should not need the transitive closure to compile a module
vromero
parents:
43577
diff
changeset
|
1373 |
if (primaryTodo.nonEmpty()) { |
0d00f3ea77bc
8172240: javac should not need the transitive closure to compile a module
vromero
parents:
43577
diff
changeset
|
1374 |
current = primaryTodo.head; |
0d00f3ea77bc
8172240: javac should not need the transitive closure to compile a module
vromero
parents:
43577
diff
changeset
|
1375 |
primaryTodo = primaryTodo.tail; |
0d00f3ea77bc
8172240: javac should not need the transitive closure to compile a module
vromero
parents:
43577
diff
changeset
|
1376 |
isPrimaryTodo = true; |
0d00f3ea77bc
8172240: javac should not need the transitive closure to compile a module
vromero
parents:
43577
diff
changeset
|
1377 |
} else { |
0d00f3ea77bc
8172240: javac should not need the transitive closure to compile a module
vromero
parents:
43577
diff
changeset
|
1378 |
current = secondaryTodo.head; |
0d00f3ea77bc
8172240: javac should not need the transitive closure to compile a module
vromero
parents:
43577
diff
changeset
|
1379 |
secondaryTodo = secondaryTodo.tail; |
0d00f3ea77bc
8172240: javac should not need the transitive closure to compile a module
vromero
parents:
43577
diff
changeset
|
1380 |
isPrimaryTodo = false; |
0d00f3ea77bc
8172240: javac should not need the transitive closure to compile a module
vromero
parents:
43577
diff
changeset
|
1381 |
} |
36526 | 1382 |
if (observable != null && !observable.contains(current)) |
1383 |
continue; |
|
1384 |
if (!result.add(current) || current == syms.unnamedModule || ((current.flags_field & Flags.AUTOMATIC_MODULE) != 0)) |
|
1385 |
continue; |
|
1386 |
current.complete(); |
|
45156
001f73134346
8178152: Handling of incubating modules, the jdk.unsupported module and --add-exports with --release <current>
jlahoda
parents:
44822
diff
changeset
|
1387 |
if (current.kind == ERR && (isPrimaryTodo || base.contains(current)) && warnedMissing.add(current)) { |
43579
0d00f3ea77bc
8172240: javac should not need the transitive closure to compile a module
vromero
parents:
43577
diff
changeset
|
1388 |
log.error(Errors.ModuleNotFound(current)); |
0d00f3ea77bc
8172240: javac should not need the transitive closure to compile a module
vromero
parents:
43577
diff
changeset
|
1389 |
} |
36526 | 1390 |
for (RequiresDirective rd : current.requires) { |
43579
0d00f3ea77bc
8172240: javac should not need the transitive closure to compile a module
vromero
parents:
43577
diff
changeset
|
1391 |
if (rd.module == syms.java_base) continue; |
45156
001f73134346
8178152: Handling of incubating modules, the jdk.unsupported module and --add-exports with --release <current>
jlahoda
parents:
44822
diff
changeset
|
1392 |
if ((rd.isTransitive() && isPrimaryTodo) || rootModules.contains(current)) { |
43579
0d00f3ea77bc
8172240: javac should not need the transitive closure to compile a module
vromero
parents:
43577
diff
changeset
|
1393 |
primaryTodo = primaryTodo.prepend(rd.module); |
0d00f3ea77bc
8172240: javac should not need the transitive closure to compile a module
vromero
parents:
43577
diff
changeset
|
1394 |
} else { |
0d00f3ea77bc
8172240: javac should not need the transitive closure to compile a module
vromero
parents:
43577
diff
changeset
|
1395 |
secondaryTodo = secondaryTodo.prepend(rd.module); |
0d00f3ea77bc
8172240: javac should not need the transitive closure to compile a module
vromero
parents:
43577
diff
changeset
|
1396 |
} |
36526 | 1397 |
} |
1398 |
} |
|
1399 |
||
1400 |
return result; |
|
1401 |
} |
|
1402 |
||
1403 |
public ModuleSymbol getObservableModule(Name name) { |
|
1404 |
ModuleSymbol mod = syms.getModule(name); |
|
1405 |
||
1406 |
if (allModules().contains(mod)) { |
|
1407 |
return mod; |
|
1408 |
} |
|
1409 |
||
1410 |
return null; |
|
1411 |
} |
|
1412 |
||
1413 |
private Completer getUnnamedModuleCompleter() { |
|
1414 |
moduleFinder.findAllModules(); |
|
1415 |
return new Symbol.Completer() { |
|
1416 |
@Override |
|
1417 |
public void complete(Symbol sym) throws CompletionFailure { |
|
41254
08f8dbf7741e
8152911: javac assertion error when compiling overlay sources
jlahoda
parents:
40768
diff
changeset
|
1418 |
if (inInitModules) { |
08f8dbf7741e
8152911: javac assertion error when compiling overlay sources
jlahoda
parents:
40768
diff
changeset
|
1419 |
sym.completer = this; |
08f8dbf7741e
8152911: javac assertion error when compiling overlay sources
jlahoda
parents:
40768
diff
changeset
|
1420 |
return ; |
08f8dbf7741e
8152911: javac assertion error when compiling overlay sources
jlahoda
parents:
40768
diff
changeset
|
1421 |
} |
36526 | 1422 |
ModuleSymbol msym = (ModuleSymbol) sym; |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1423 |
Set<ModuleSymbol> allModules = new HashSet<>(allModules()); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1424 |
allModules.remove(syms.unnamedModule); |
36526 | 1425 |
for (ModuleSymbol m : allModules) { |
1426 |
m.complete(); |
|
1427 |
} |
|
1428 |
initVisiblePackages(msym, allModules); |
|
1429 |
} |
|
1430 |
||
1431 |
@Override |
|
1432 |
public String toString() { |
|
1433 |
return "unnamedModule Completer"; |
|
1434 |
} |
|
1435 |
}; |
|
1436 |
} |
|
1437 |
||
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1438 |
private final Map<ModuleSymbol, Set<ModuleSymbol>> requiresTransitiveCache = new HashMap<>(); |
36526 | 1439 |
|
1440 |
private void completeModule(ModuleSymbol msym) { |
|
39917
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
1441 |
if (inInitModules) { |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
1442 |
msym.completer = sym -> completeModule(msym); |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
1443 |
return ; |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
1444 |
} |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
1445 |
|
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
1446 |
if ((msym.flags_field & Flags.AUTOMATIC_MODULE) != 0) { |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
1447 |
completeAutomaticModule(msym); |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
1448 |
} |
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
1449 |
|
36526 | 1450 |
Assert.checkNonNull(msym.requires); |
1451 |
||
1452 |
initAddReads(); |
|
1453 |
||
1454 |
msym.requires = msym.requires.appendList(List.from(addReads.getOrDefault(msym, Collections.emptySet()))); |
|
1455 |
||
1456 |
List<RequiresDirective> requires = msym.requires; |
|
1457 |
||
1458 |
while (requires.nonEmpty()) { |
|
1459 |
if (!allModules().contains(requires.head.module)) { |
|
1460 |
Env<AttrContext> env = typeEnvs.get(msym); |
|
1461 |
if (env != null) { |
|
1462 |
JavaFileObject origSource = log.useSource(env.toplevel.sourcefile); |
|
1463 |
try { |
|
1464 |
log.error(/*XXX*/env.tree, Errors.ModuleNotFound(requires.head.module)); |
|
1465 |
} finally { |
|
1466 |
log.useSource(origSource); |
|
1467 |
} |
|
1468 |
} else { |
|
1469 |
Assert.check((msym.flags() & Flags.AUTOMATIC_MODULE) == 0); |
|
1470 |
} |
|
43271
ce89609dde7c
8172809: Error compiling javafx modules after fix for JDK-8169197
jlahoda
parents:
43270
diff
changeset
|
1471 |
msym.requires = List.filter(msym.requires, requires.head); |
36526 | 1472 |
} |
1473 |
requires = requires.tail; |
|
1474 |
} |
|
1475 |
||
1476 |
Set<ModuleSymbol> readable = new LinkedHashSet<>(); |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1477 |
Set<ModuleSymbol> requiresTransitive = new HashSet<>(); |
39366
8bf5fe72ca88
8155026: javac grants implied readability to explicit modules
jlahoda
parents:
39361
diff
changeset
|
1478 |
|
8bf5fe72ca88
8155026: javac grants implied readability to explicit modules
jlahoda
parents:
39361
diff
changeset
|
1479 |
for (RequiresDirective d : msym.requires) { |
8bf5fe72ca88
8155026: javac grants implied readability to explicit modules
jlahoda
parents:
39361
diff
changeset
|
1480 |
d.module.complete(); |
8bf5fe72ca88
8155026: javac grants implied readability to explicit modules
jlahoda
parents:
39361
diff
changeset
|
1481 |
readable.add(d.module); |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1482 |
Set<ModuleSymbol> s = retrieveRequiresTransitive(d.module); |
39366
8bf5fe72ca88
8155026: javac grants implied readability to explicit modules
jlahoda
parents:
39361
diff
changeset
|
1483 |
Assert.checkNonNull(s, () -> "no entry in cache for " + d.module); |
8bf5fe72ca88
8155026: javac grants implied readability to explicit modules
jlahoda
parents:
39361
diff
changeset
|
1484 |
readable.addAll(s); |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1485 |
if (d.flags.contains(RequiresFlag.TRANSITIVE)) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1486 |
requiresTransitive.add(d.module); |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1487 |
requiresTransitive.addAll(s); |
36526 | 1488 |
} |
39366
8bf5fe72ca88
8155026: javac grants implied readability to explicit modules
jlahoda
parents:
39361
diff
changeset
|
1489 |
} |
36526 | 1490 |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1491 |
requiresTransitiveCache.put(msym, requiresTransitive); |
36526 | 1492 |
initVisiblePackages(msym, readable); |
1493 |
for (ExportsDirective d: msym.exports) { |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1494 |
if (d.packge != null) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1495 |
d.packge.modle = msym; |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1496 |
} |
36526 | 1497 |
} |
1498 |
||
45156
001f73134346
8178152: Handling of incubating modules, the jdk.unsupported module and --add-exports with --release <current>
jlahoda
parents:
44822
diff
changeset
|
1499 |
if (!allowAccessIntoSystem && (msym.flags() & Flags.SYSTEM_MODULE) != 0 && |
001f73134346
8178152: Handling of incubating modules, the jdk.unsupported module and --add-exports with --release <current>
jlahoda
parents:
44822
diff
changeset
|
1500 |
msym.patchLocation != null) { |
001f73134346
8178152: Handling of incubating modules, the jdk.unsupported module and --add-exports with --release <current>
jlahoda
parents:
44822
diff
changeset
|
1501 |
log.error(Errors.PatchModuleWithRelease(msym)); |
001f73134346
8178152: Handling of incubating modules, the jdk.unsupported module and --add-exports with --release <current>
jlahoda
parents:
44822
diff
changeset
|
1502 |
} |
36526 | 1503 |
} |
1504 |
||
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1505 |
private Set<ModuleSymbol> retrieveRequiresTransitive(ModuleSymbol msym) { |
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1506 |
Set<ModuleSymbol> requiresTransitive = requiresTransitiveCache.get(msym); |
36526 | 1507 |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1508 |
if (requiresTransitive == null) { |
40762
f8883aa0053c
8160851: Remove old launcher module-related options
mchung
parents:
40604
diff
changeset
|
1509 |
//the module graph may contain cycles involving automatic modules or --add-reads edges |
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1510 |
requiresTransitive = new HashSet<>(); |
36526 | 1511 |
|
1512 |
Set<ModuleSymbol> seen = new HashSet<>(); |
|
1513 |
List<ModuleSymbol> todo = List.of(msym); |
|
1514 |
||
1515 |
while (todo.nonEmpty()) { |
|
1516 |
ModuleSymbol current = todo.head; |
|
1517 |
todo = todo.tail; |
|
1518 |
if (!seen.add(current)) |
|
1519 |
continue; |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1520 |
requiresTransitive.add(current); |
36526 | 1521 |
current.complete(); |
1522 |
Iterable<? extends RequiresDirective> requires; |
|
1523 |
if (current != syms.unnamedModule) { |
|
1524 |
Assert.checkNonNull(current.requires, () -> current + ".requires == null; " + msym); |
|
1525 |
requires = current.requires; |
|
1526 |
for (RequiresDirective rd : requires) { |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1527 |
if (rd.isTransitive()) |
36526 | 1528 |
todo = todo.prepend(rd.module); |
1529 |
} |
|
1530 |
} else { |
|
1531 |
for (ModuleSymbol mod : allModules()) { |
|
1532 |
todo = todo.prepend(mod); |
|
1533 |
} |
|
1534 |
} |
|
1535 |
} |
|
1536 |
||
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1537 |
requiresTransitive.remove(msym); |
36526 | 1538 |
} |
1539 |
||
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41999
diff
changeset
|
1540 |
return requiresTransitive; |
36526 | 1541 |
} |
1542 |
||
1543 |
private void initVisiblePackages(ModuleSymbol msym, Collection<ModuleSymbol> readable) { |
|
1544 |
initAddExports(); |
|
1545 |
||
1546 |
msym.visiblePackages = new LinkedHashMap<>(); |
|
43138
680d378b9d64
8169197: Improve error reporting for compiling against unexported package
jlahoda
parents:
42841
diff
changeset
|
1547 |
msym.readModules = new HashSet<>(readable); |
36526 | 1548 |
|
1549 |
Map<Name, ModuleSymbol> seen = new HashMap<>(); |
|
1550 |
||
1551 |
for (ModuleSymbol rm : readable) { |
|
1552 |
if (rm == syms.unnamedModule) |
|
1553 |
continue; |
|
1554 |
addVisiblePackages(msym, seen, rm, rm.exports); |
|
1555 |
} |
|
1556 |
||
41938
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1557 |
addExports.forEach((exportsFrom, exports) -> { |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1558 |
addVisiblePackages(msym, seen, exportsFrom, exports); |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1559 |
}); |
36526 | 1560 |
} |
1561 |
||
1562 |
private void addVisiblePackages(ModuleSymbol msym, |
|
1563 |
Map<Name, ModuleSymbol> seenPackages, |
|
1564 |
ModuleSymbol exportsFrom, |
|
1565 |
Collection<ExportsDirective> exports) { |
|
1566 |
for (ExportsDirective d : exports) { |
|
1567 |
if (d.modules == null || d.modules.contains(msym)) { |
|
1568 |
Name packageName = d.packge.fullname; |
|
1569 |
ModuleSymbol previousModule = seenPackages.get(packageName); |
|
1570 |
||
1571 |
if (previousModule != null && previousModule != exportsFrom) { |
|
1572 |
Env<AttrContext> env = typeEnvs.get(msym); |
|
1573 |
JavaFileObject origSource = env != null ? log.useSource(env.toplevel.sourcefile) |
|
1574 |
: null; |
|
1575 |
DiagnosticPosition pos = env != null ? env.tree.pos() : null; |
|
1576 |
try { |
|
1577 |
log.error(pos, Errors.PackageClashFromRequires(msym, packageName, |
|
1578 |
previousModule, exportsFrom)); |
|
1579 |
} finally { |
|
1580 |
if (env != null) |
|
1581 |
log.useSource(origSource); |
|
1582 |
} |
|
1583 |
continue; |
|
1584 |
} |
|
1585 |
||
1586 |
seenPackages.put(packageName, exportsFrom); |
|
1587 |
msym.visiblePackages.put(d.packge.fullname, d.packge); |
|
1588 |
} |
|
1589 |
} |
|
1590 |
} |
|
1591 |
||
1592 |
private void initAddExports() { |
|
1593 |
if (addExports != null) |
|
1594 |
return; |
|
1595 |
||
1596 |
addExports = new LinkedHashMap<>(); |
|
41938
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1597 |
Set<ModuleSymbol> unknownModules = new HashSet<>(); |
36526 | 1598 |
|
1599 |
if (addExportsOpt == null) |
|
1600 |
return; |
|
1601 |
||
1602 |
Pattern ep = Pattern.compile("([^/]+)/([^=]+)=(.*)"); |
|
1603 |
for (String s: addExportsOpt.split("\0+")) { |
|
1604 |
if (s.isEmpty()) |
|
1605 |
continue; |
|
1606 |
Matcher em = ep.matcher(s); |
|
1607 |
if (!em.matches()) { |
|
1608 |
continue; |
|
1609 |
} |
|
1610 |
||
1611 |
// Terminology comes from |
|
40762
f8883aa0053c
8160851: Remove old launcher module-related options
mchung
parents:
40604
diff
changeset
|
1612 |
// --add-exports module/package=target,... |
36526 | 1613 |
// Compare to |
1614 |
// module module { exports package to target, ... } |
|
1615 |
String moduleName = em.group(1); |
|
1616 |
String packageName = em.group(2); |
|
1617 |
String targetNames = em.group(3); |
|
1618 |
||
41938
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1619 |
if (!isValidName(moduleName)) |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1620 |
continue; |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1621 |
|
36526 | 1622 |
ModuleSymbol msym = syms.enterModule(names.fromString(moduleName)); |
41938
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1623 |
if (!isKnownModule(msym, unknownModules)) |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1624 |
continue; |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1625 |
|
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1626 |
if (!isValidName(packageName)) |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1627 |
continue; |
45156
001f73134346
8178152: Handling of incubating modules, the jdk.unsupported module and --add-exports with --release <current>
jlahoda
parents:
44822
diff
changeset
|
1628 |
|
001f73134346
8178152: Handling of incubating modules, the jdk.unsupported module and --add-exports with --release <current>
jlahoda
parents:
44822
diff
changeset
|
1629 |
if (!allowAccessIntoSystem && (msym.flags() & Flags.SYSTEM_MODULE) != 0) { |
001f73134346
8178152: Handling of incubating modules, the jdk.unsupported module and --add-exports with --release <current>
jlahoda
parents:
44822
diff
changeset
|
1630 |
log.error(Errors.AddExportsWithRelease(msym)); |
001f73134346
8178152: Handling of incubating modules, the jdk.unsupported module and --add-exports with --release <current>
jlahoda
parents:
44822
diff
changeset
|
1631 |
continue; |
001f73134346
8178152: Handling of incubating modules, the jdk.unsupported module and --add-exports with --release <current>
jlahoda
parents:
44822
diff
changeset
|
1632 |
} |
001f73134346
8178152: Handling of incubating modules, the jdk.unsupported module and --add-exports with --release <current>
jlahoda
parents:
44822
diff
changeset
|
1633 |
|
36526 | 1634 |
PackageSymbol p = syms.enterPackage(msym, names.fromString(packageName)); |
1635 |
p.modle = msym; // TODO: do we need this? |
|
1636 |
||
1637 |
List<ModuleSymbol> targetModules = List.nil(); |
|
1638 |
for (String toModule : targetNames.split("[ ,]+")) { |
|
1639 |
ModuleSymbol m; |
|
1640 |
if (toModule.equals("ALL-UNNAMED")) { |
|
1641 |
m = syms.unnamedModule; |
|
1642 |
} else { |
|
41938
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1643 |
if (!isValidName(toModule)) |
36526 | 1644 |
continue; |
1645 |
m = syms.enterModule(names.fromString(toModule)); |
|
41938
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1646 |
if (!isKnownModule(m, unknownModules)) |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1647 |
continue; |
36526 | 1648 |
} |
1649 |
targetModules = targetModules.prepend(m); |
|
1650 |
} |
|
1651 |
||
1652 |
Set<ExportsDirective> extra = addExports.computeIfAbsent(msym, _x -> new LinkedHashSet<>()); |
|
1653 |
ExportsDirective d = new ExportsDirective(p, targetModules); |
|
1654 |
extra.add(d); |
|
1655 |
} |
|
1656 |
} |
|
1657 |
||
41938
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1658 |
private boolean isKnownModule(ModuleSymbol msym, Set<ModuleSymbol> unknownModules) { |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1659 |
if (allModules.contains(msym)) { |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1660 |
return true; |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1661 |
} |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1662 |
|
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1663 |
if (!unknownModules.contains(msym)) { |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1664 |
if (lintOptions) { |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1665 |
log.warning(LintCategory.OPTIONS, |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1666 |
Warnings.ModuleForOptionNotFound(Option.ADD_EXPORTS, msym)); |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1667 |
} |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1668 |
unknownModules.add(msym); |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1669 |
} |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1670 |
return false; |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1671 |
} |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1672 |
|
36526 | 1673 |
private void initAddReads() { |
1674 |
if (addReads != null) |
|
1675 |
return; |
|
1676 |
||
1677 |
addReads = new LinkedHashMap<>(); |
|
1678 |
||
1679 |
if (addReadsOpt == null) |
|
1680 |
return; |
|
1681 |
||
1682 |
Pattern rp = Pattern.compile("([^=]+)=(.*)"); |
|
1683 |
for (String s : addReadsOpt.split("\0+")) { |
|
1684 |
if (s.isEmpty()) |
|
1685 |
continue; |
|
1686 |
Matcher rm = rp.matcher(s); |
|
1687 |
if (!rm.matches()) { |
|
1688 |
continue; |
|
1689 |
} |
|
1690 |
||
1691 |
// Terminology comes from |
|
41938
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1692 |
// --add-reads source-module=target-module,... |
36526 | 1693 |
// Compare to |
41938
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1694 |
// module source-module { requires target-module; ... } |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1695 |
String sourceName = rm.group(1); |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1696 |
String targetNames = rm.group(2); |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1697 |
|
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1698 |
if (!isValidName(sourceName)) |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1699 |
continue; |
36526 | 1700 |
|
41938
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1701 |
ModuleSymbol msym = syms.enterModule(names.fromString(sourceName)); |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1702 |
if (!allModules.contains(msym)) { |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1703 |
if (lintOptions) { |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1704 |
log.warning(Warnings.ModuleForOptionNotFound(Option.ADD_READS, msym)); |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1705 |
} |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1706 |
continue; |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1707 |
} |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1708 |
|
45156
001f73134346
8178152: Handling of incubating modules, the jdk.unsupported module and --add-exports with --release <current>
jlahoda
parents:
44822
diff
changeset
|
1709 |
if (!allowAccessIntoSystem && (msym.flags() & Flags.SYSTEM_MODULE) != 0) { |
001f73134346
8178152: Handling of incubating modules, the jdk.unsupported module and --add-exports with --release <current>
jlahoda
parents:
44822
diff
changeset
|
1710 |
log.error(Errors.AddReadsWithRelease(msym)); |
001f73134346
8178152: Handling of incubating modules, the jdk.unsupported module and --add-exports with --release <current>
jlahoda
parents:
44822
diff
changeset
|
1711 |
continue; |
001f73134346
8178152: Handling of incubating modules, the jdk.unsupported module and --add-exports with --release <current>
jlahoda
parents:
44822
diff
changeset
|
1712 |
} |
001f73134346
8178152: Handling of incubating modules, the jdk.unsupported module and --add-exports with --release <current>
jlahoda
parents:
44822
diff
changeset
|
1713 |
|
41938
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1714 |
for (String targetName : targetNames.split("[ ,]+", -1)) { |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1715 |
ModuleSymbol targetModule; |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1716 |
if (targetName.equals("ALL-UNNAMED")) { |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1717 |
targetModule = syms.unnamedModule; |
36526 | 1718 |
} else { |
41938
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1719 |
if (!isValidName(targetName)) |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1720 |
continue; |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1721 |
targetModule = syms.enterModule(names.fromString(targetName)); |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1722 |
if (!allModules.contains(targetModule)) { |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1723 |
if (lintOptions) { |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1724 |
log.warning(LintCategory.OPTIONS, Warnings.ModuleForOptionNotFound(Option.ADD_READS, targetModule)); |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1725 |
} |
36526 | 1726 |
continue; |
1727 |
} |
|
1728 |
} |
|
1729 |
addReads.computeIfAbsent(msym, m -> new HashSet<>()) |
|
41938
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1730 |
.add(new RequiresDirective(targetModule, EnumSet.of(RequiresFlag.EXTRA))); |
36526 | 1731 |
} |
1732 |
} |
|
1733 |
} |
|
1734 |
||
1735 |
private void checkCyclicDependencies(JCModuleDecl mod) { |
|
1736 |
for (JCDirective d : mod.directives) { |
|
39915
5d1e0740e709
8158224: NullPointerException in com.sun.tools.javac.comp.Modules.checkCyclicDependencies when module missing
sadayapalam
parents:
39366
diff
changeset
|
1737 |
JCRequires rd; |
5d1e0740e709
8158224: NullPointerException in com.sun.tools.javac.comp.Modules.checkCyclicDependencies when module missing
sadayapalam
parents:
39366
diff
changeset
|
1738 |
if (!d.hasTag(Tag.REQUIRES) || (rd = (JCRequires) d).directive == null) |
36526 | 1739 |
continue; |
1740 |
Set<ModuleSymbol> nonSyntheticDeps = new HashSet<>(); |
|
1741 |
List<ModuleSymbol> queue = List.of(rd.directive.module); |
|
1742 |
while (queue.nonEmpty()) { |
|
1743 |
ModuleSymbol current = queue.head; |
|
1744 |
queue = queue.tail; |
|
1745 |
if (!nonSyntheticDeps.add(current)) |
|
1746 |
continue; |
|
39917
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
1747 |
current.complete(); |
36526 | 1748 |
if ((current.flags() & Flags.ACYCLIC) != 0) |
1749 |
continue; |
|
42827
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42824
diff
changeset
|
1750 |
Assert.checkNonNull(current.requires, current::toString); |
36526 | 1751 |
for (RequiresDirective dep : current.requires) { |
1752 |
if (!dep.flags.contains(RequiresFlag.EXTRA)) |
|
1753 |
queue = queue.prepend(dep.module); |
|
1754 |
} |
|
1755 |
} |
|
1756 |
if (nonSyntheticDeps.contains(mod.sym)) { |
|
1757 |
log.error(rd.moduleName.pos(), Errors.CyclicRequires(rd.directive.module)); |
|
1758 |
} |
|
1759 |
mod.sym.flags_field |= Flags.ACYCLIC; |
|
1760 |
} |
|
1761 |
} |
|
1762 |
||
41938
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1763 |
private boolean isValidName(CharSequence name) { |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1764 |
return SourceVersion.isName(name, Source.toSourceVersion(source)); |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1765 |
} |
8e66bf10fcec
8167975: align javac --add-* modules options with launcher
jjg
parents:
41932
diff
changeset
|
1766 |
|
36526 | 1767 |
// DEBUG |
1768 |
private String toString(ModuleSymbol msym) { |
|
1769 |
return msym.name + "[" |
|
1770 |
+ "kind:" + msym.kind + ";" |
|
1771 |
+ "locn:" + toString(msym.sourceLocation) + "," + toString(msym.classLocation) + ";" |
|
1772 |
+ "info:" + toString(msym.module_info.sourcefile) + "," |
|
1773 |
+ toString(msym.module_info.classfile) + "," |
|
1774 |
+ msym.module_info.completer |
|
1775 |
+ "]"; |
|
1776 |
} |
|
1777 |
||
1778 |
// DEBUG |
|
1779 |
String toString(Location locn) { |
|
1780 |
return (locn == null) ? "--" : locn.getName(); |
|
1781 |
} |
|
1782 |
||
1783 |
// DEBUG |
|
1784 |
String toString(JavaFileObject fo) { |
|
1785 |
return (fo == null) ? "--" : fo.getName(); |
|
1786 |
} |
|
1787 |
||
1788 |
public void newRound() { |
|
43772
4e5350b7be75
8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents:
43588
diff
changeset
|
1789 |
allModules = null; |
39917
c51a8950f278
8154705: invalid use of ALL-MODULE-PATH causes crash
ksrini
parents:
39915
diff
changeset
|
1790 |
rootModules = null; |
43579
0d00f3ea77bc
8172240: javac should not need the transitive closure to compile a module
vromero
parents:
43577
diff
changeset
|
1791 |
warnedMissing.clear(); |
36526 | 1792 |
} |
44290
202973b2d1ae
8176045: No compile error when a package is not declared
jlahoda
parents:
44289
diff
changeset
|
1793 |
|
202973b2d1ae
8176045: No compile error when a package is not declared
jlahoda
parents:
44289
diff
changeset
|
1794 |
public interface PackageNameFinder { |
202973b2d1ae
8176045: No compile error when a package is not declared
jlahoda
parents:
44289
diff
changeset
|
1795 |
public Name findPackageNameOf(JavaFileObject jfo); |
202973b2d1ae
8176045: No compile error when a package is not declared
jlahoda
parents:
44289
diff
changeset
|
1796 |
} |
36526 | 1797 |
} |