8245664: javac erroneously issues deprecation warning for use of a deprecated package

Reviewed-by: vromero
This commit is contained in:
Jan Lahoda 2020-09-03 11:14:23 +02:00
parent aab706c66f
commit a951a15379
2 changed files with 89 additions and 1 deletions
src/jdk.compiler/share/classes/com/sun/tools/javac/comp
test/langtools/tools/javac/lint

@ -3515,7 +3515,8 @@ public class Check {
void checkDeprecated(Supplier<DiagnosticPosition> pos, final Symbol other, final Symbol s) {
if ( (s.isDeprecatedForRemoval()
|| s.isDeprecated() && !other.isDeprecated())
&& (s.outermostClass() != other.outermostClass() || s.outermostClass() == null)) {
&& (s.outermostClass() != other.outermostClass() || s.outermostClass() == null)
&& s.kind != Kind.PCK) {
deferredLintHandler.report(() -> warnDeprecated(pos.get(), s));
}
}

@ -0,0 +1,87 @@
/*
* Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8245664
* @summary Verify deprecation message is not reported for deprecated packages.
* @library /tools/lib
* @modules
* jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* @build toolbox.ToolBox toolbox.JavacTask
* @run main DeprecationTest
*/
import toolbox.JavacTask;
import toolbox.Task;
import toolbox.TestRunner;
import toolbox.ToolBox;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.List;
import java.util.Objects;
public class DeprecationTest extends TestRunner {
protected ToolBox tb;
DeprecationTest() {
super(System.err);
tb = new ToolBox();
}
public static void main(String... args) throws Exception {
DeprecationTest t = new DeprecationTest();
t.runTests(m -> new Object[] { Paths.get(m.getName()) });
}
@Test
public void deprecatedPackage(Path base) throws Exception {
Path src = base.resolve("src");
tb.writeJavaFiles(src,
"@Deprecated package p;",
"package p; public class Test { use.DeprecatedClass d1; }",
"package use; public class Use1 { p.Test t; Class<?> c = p.Test.class; }",
"package use; import p.Test; public class Use2 { Test t; Class<?> c = Test.class; }",
"package use; @Deprecated public class DeprecatedClass { }");
List<String> actual =
new JavacTask(tb, Task.Mode.CMDLINE)
.options("-Xlint:deprecation",
"-XDrawDiagnostics")
.files(tb.findJavaFiles(src))
.run(Task.Expect.SUCCESS)
.writeAll()
.getOutputLines(Task.OutputKind.DIRECT);
List<String> expected = List.of("package-info.java:1:21: compiler.warn.deprecated.annotation.has.no.effect: kindname.package",
"Test.java:1:35: compiler.warn.has.been.deprecated: use.DeprecatedClass, use",
"2 warnings");
if (!Objects.equals(actual, expected)) {
throw new AssertionError("Unexpected log output: " + actual);
}
}
}