archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8189765: Improve error reporting for compiling against package not visible due to modules

Browse source 
When looking in other modules for an undefined Symbol, also look into the unnamed module.

Reviewed-by: mcimadamore
This commit is contained in:
Jan Lahoda 2018-04-12 09:23:34 +02:00
parent 8483faa4a9
commit 594fb594ce
4 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
View file

@ -2120,6 +2120,7 @@ public class Resolve {
Set<ModuleSymbol> recoverableModules = new HashSet<>(syms.getAllModules()); Set<ModuleSymbol> recoverableModules = new HashSet<>(syms.getAllModules());
recoverableModules.add(syms.unnamedModule);
recoverableModules.remove(env.toplevel.modle); recoverableModules.remove(env.toplevel.modle);
for (ModuleSymbol ms : recoverableModules) { for (ModuleSymbol ms : recoverableModules) {

2
test/langtools/tools/javac/modules/CompileModulePatchTest.java
View file

@ -252,7 +252,7 @@ public class CompileModulePatchTest extends ModuleTestBase {
.getOutputLines(Task.OutputKind.DIRECT); .getOutputLines(Task.OutputKind.DIRECT);
List<String> expectedOut = Arrays.asList( List<String> expectedOut = Arrays.asList(
"Extra.java:1:76: compiler.err.doesnt.exist: p", "Extra.java:1:75: compiler.err.package.not.visible: p, (compiler.misc.not.def.access.does.not.read.unnamed: p, java.compiler)",
"1 error" "1 error"
); );

8
test/langtools/tools/javac/modules/ConvenientAccessErrorsTest.java
View file

@ -23,7 +23,7 @@
/* /*
* @test * @test
* @bug 8169197 8172668 8173117 8175007 * @bug 8169197 8172668 8173117 8175007 8189765
* @summary Check convenient errors are produced for inaccessible classes. * @summary Check convenient errors are produced for inaccessible classes.
* @library /tools/lib * @library /tools/lib
* @modules jdk.compiler/com.sun.tools.javac.api * @modules jdk.compiler/com.sun.tools.javac.api
@ -199,7 +199,7 @@ public class ConvenientAccessErrorsTest extends ModuleTestBase {
throw new Exception("expected output not found; actual: " + log); throw new Exception("expected output not found; actual: " + log);
} }
// @Test @Test
public void testInaccessibleUnnamedModule(Path base) throws Exception { public void testInaccessibleUnnamedModule(Path base) throws Exception {
Path jar = prepareTestJar(base, "package api; class Api { public static class Foo {} }"); Path jar = prepareTestJar(base, "package api; class Api { public static class Foo {} }");
@ -224,8 +224,8 @@ public class ConvenientAccessErrorsTest extends ModuleTestBase {
.getOutputLines(Task.OutputKind.DIRECT); .getOutputLines(Task.OutputKind.DIRECT);
List<String> expected = Arrays.asList( List<String> expected = Arrays.asList(
"Test.java:1:38: compiler.err.not.def.access.package.cant.access: api.Api, api, (compiler.misc.not.def.access.does.not.read.unnamed: api, m1x)", "Test.java:1:35: compiler.err.package.not.visible: api, (compiler.misc.not.def.access.does.not.read.unnamed: api, m1x)",
"Test.java:1:51: compiler.err.not.def.access.package.cant.access: api.Api, api, (compiler.misc.not.def.access.does.not.read.unnamed: api, m1x)", "Test.java:1:48: compiler.err.package.not.visible: api, (compiler.misc.not.def.access.does.not.read.unnamed: api, m1x)",
"2 errors"); "2 errors");
if (!expected.equals(log)) if (!expected.equals(log))

6
test/langtools/tools/javac/modules/ModulesAndClassPathTest.java
View file

@ -77,7 +77,7 @@ public class ModulesAndClassPathTest extends ModuleTestBase {
.writeAll() .writeAll()
.getOutputLines(Task.OutputKind.DIRECT); .getOutputLines(Task.OutputKind.DIRECT);
List<String> expected = Arrays.asList("Impl.java:1:38: compiler.err.doesnt.exist: api", List<String> expected = Arrays.asList("Impl.java:1:35: compiler.err.package.not.visible: api, (compiler.misc.not.def.access.does.not.read.unnamed: api, m)",
"1 error"); "1 error");
if (!expected.equals(modLog)) { if (!expected.equals(modLog)) {
@ -129,7 +129,7 @@ public class ModulesAndClassPathTest extends ModuleTestBase {
.writeAll() .writeAll()
.getOutputLines(Task.OutputKind.DIRECT); .getOutputLines(Task.OutputKind.DIRECT);
List<String> expected = Arrays.asList("Impl.java:1:38: compiler.err.doesnt.exist: api", List<String> expected = Arrays.asList("Impl.java:1:35: compiler.err.package.not.visible: api, (compiler.misc.not.def.access.does.not.read.unnamed: api, m)",
"1 error"); "1 error");
if (!expected.equals(modLog)) { if (!expected.equals(modLog)) {
@ -170,7 +170,7 @@ public class ModulesAndClassPathTest extends ModuleTestBase {
.writeAll() .writeAll()
.getOutputLines(Task.OutputKind.DIRECT); .getOutputLines(Task.OutputKind.DIRECT);
List<String> expected = Arrays.asList("Impl.java:1:38: compiler.err.doesnt.exist: api", List<String> expected = Arrays.asList("Impl.java:1:35: compiler.err.package.not.visible: api, (compiler.misc.not.def.access.does.not.read.unnamed: api, m)",
"1 error"); "1 error");
if (!expected.equals(modLog)) { if (!expected.equals(modLog)) {