From f345a405af1198b321ae599e80292d40f1cb671d Mon Sep 17 00:00:00 2001 From: jlahoda Date: Thu, 12 Apr 2018 09:23:34 +0200 Subject: [PATCH] 8189765: Improve error reporting for compiling against package not visible due to modules Summary: When looking in other modules for an undefined Symbol, also look into the unnamed module. Reviewed-by: mcimadamore --- .../share/classes/com/sun/tools/javac/comp/Resolve.java | 1 + .../tools/javac/modules/CompileModulePatchTest.java | 2 +- .../tools/javac/modules/ConvenientAccessErrorsTest.java | 8 ++++---- .../tools/javac/modules/ModulesAndClassPathTest.java | 6 +++--- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java index d07e4a86a9..374049f951 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java @@ -2120,6 +2120,7 @@ public class Resolve { Set recoverableModules = new HashSet<>(syms.getAllModules()); + recoverableModules.add(syms.unnamedModule); recoverableModules.remove(env.toplevel.modle); for (ModuleSymbol ms : recoverableModules) { diff --git a/test/langtools/tools/javac/modules/CompileModulePatchTest.java b/test/langtools/tools/javac/modules/CompileModulePatchTest.java index 1ff40cdcc6..bc86f74c70 100644 --- a/test/langtools/tools/javac/modules/CompileModulePatchTest.java +++ b/test/langtools/tools/javac/modules/CompileModulePatchTest.java @@ -252,7 +252,7 @@ public class CompileModulePatchTest extends ModuleTestBase { .getOutputLines(Task.OutputKind.DIRECT); List 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" ); diff --git a/test/langtools/tools/javac/modules/ConvenientAccessErrorsTest.java b/test/langtools/tools/javac/modules/ConvenientAccessErrorsTest.java index 3fed25a3ab..56341d4abe 100644 --- a/test/langtools/tools/javac/modules/ConvenientAccessErrorsTest.java +++ b/test/langtools/tools/javac/modules/ConvenientAccessErrorsTest.java @@ -23,7 +23,7 @@ /* * @test - * @bug 8169197 8172668 8173117 8175007 + * @bug 8169197 8172668 8173117 8175007 8189765 * @summary Check convenient errors are produced for inaccessible classes. * @library /tools/lib * @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); } -// @Test + @Test public void testInaccessibleUnnamedModule(Path base) throws Exception { 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); List 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: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:35: compiler.err.package.not.visible: 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"); if (!expected.equals(log)) diff --git a/test/langtools/tools/javac/modules/ModulesAndClassPathTest.java b/test/langtools/tools/javac/modules/ModulesAndClassPathTest.java index e88aeadc93..656aab9aef 100644 --- a/test/langtools/tools/javac/modules/ModulesAndClassPathTest.java +++ b/test/langtools/tools/javac/modules/ModulesAndClassPathTest.java @@ -77,7 +77,7 @@ public class ModulesAndClassPathTest extends ModuleTestBase { .writeAll() .getOutputLines(Task.OutputKind.DIRECT); - List expected = Arrays.asList("Impl.java:1:38: compiler.err.doesnt.exist: api", + List 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"); if (!expected.equals(modLog)) { @@ -129,7 +129,7 @@ public class ModulesAndClassPathTest extends ModuleTestBase { .writeAll() .getOutputLines(Task.OutputKind.DIRECT); - List expected = Arrays.asList("Impl.java:1:38: compiler.err.doesnt.exist: api", + List 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"); if (!expected.equals(modLog)) { @@ -170,7 +170,7 @@ public class ModulesAndClassPathTest extends ModuleTestBase { .writeAll() .getOutputLines(Task.OutputKind.DIRECT); - List expected = Arrays.asList("Impl.java:1:38: compiler.err.doesnt.exist: api", + List 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"); if (!expected.equals(modLog)) { -- GitLab