stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8259039: Passing different version to --release flag than javac version output warning

Browse Source 
Reviewed-by: jjg
This commit is contained in:
Jan Lahoda 2021-09-20 13:43:14 +00:00
parent f71df142a9
commit 699865f76c
4 changed files with 158 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java
View File

@ -250,22 +250,29 @@ public class ClassFinder {
supplementaryFlags = new HashMap<>();
}
Long flags = supplementaryFlags.get(c.packge());
PackageSymbol packge = c.packge();
Long flags = supplementaryFlags.get(packge);
if (flags == null) {
long newFlags = 0;
try {
JRTIndex.CtSym ctSym = jrtIndex.getCtSym(c.packge().flatName());
Profile minProfile = Profile.DEFAULT;
if (ctSym.proprietary)
ModuleSymbol owningModule = packge.modle;
if (owningModule == syms.noModule) {
JRTIndex.CtSym ctSym = jrtIndex.getCtSym(packge.flatName());
Profile minProfile = Profile.DEFAULT;
if (ctSym.proprietary)
newFlags |= PROPRIETARY;
if (ctSym.minProfile != null)
minProfile = Profile.lookup(ctSym.minProfile);
if (profile != Profile.DEFAULT && minProfile.value > profile.value) {
newFlags |= NOT_IN_PROFILE;
}
} else if (owningModule.name == names.jdk_unsupported) {
newFlags |= PROPRIETARY;
if (ctSym.minProfile != null)
minProfile = Profile.lookup(ctSym.minProfile);
if (profile != Profile.DEFAULT && minProfile.value > profile.value) {
newFlags |= NOT_IN_PROFILE;
}
} catch (IOException ignore) {
}
supplementaryFlags.put(c.packge(), flags = newFlags);
supplementaryFlags.put(packge, flags = newFlags);
}
return flags;
}

2
src/jdk.compiler/share/classes/com/sun/tools/javac/resources/ct.properties
View File

@ -163,7 +163,7 @@ com.sun.net.httpserver.*: compact2
com.sun.net.httpserver.spi.*: compact2
com.sun.net.ssl.*: compact1
com.sun.net.ssl.internal.www.protocol.https.*: proprietary compact1
com.sun.nio.file.*: compact1
com.sun.nio.file.*: proprietary compact1
com.sun.nio.sctp.*: compact3
com.sun.org.apache.bcel.internal.*: proprietary compact2
com.sun.org.apache.bcel.internal.classfile.*: proprietary compact2

2
src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java
View File

@ -122,6 +122,7 @@ public class Names {
// module names
public final Name java_base;
public final Name jdk_unsupported;
// attribute names
public final Name Annotation;
@ -301,6 +302,7 @@ public class Names {
// module names
java_base = fromString("java.base");
jdk_unsupported = fromString("jdk.unsupported");
// attribute names
Annotation = fromString("Annotation");

139
test/langtools/tools/javac/platform/CtPropertiesTest.java Normal file
View File

@ -0,0 +1,139 @@
/*
* Copyright (c) 2021, 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 8259039
* @summary Verify behavior of --release and -source related to com.sun.nio.file
* @library /tools/lib
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.platform
* jdk.compiler/com.sun.tools.javac.util:+open
* @build toolbox.ToolBox CtPropertiesTest
* @run main CtPropertiesTest
*/
import java.io.IOException;
import java.net.URISyntaxException;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
import toolbox.JavacTask;
import toolbox.Task;
import toolbox.ToolBox;
public class CtPropertiesTest {
public static void main(String... args) throws IOException, URISyntaxException {
CtPropertiesTest t = new CtPropertiesTest();
t.runSource();
t.runRelease();
}
void runSource() throws IOException {
Path root = Paths.get(".");
Path classes = root.resolve("classes");
Files.createDirectories(classes);
ToolBox tb = new ToolBox();
List<String> log;
List<String> expected;
expected = List.of(
"Test.java:2:21: compiler.warn.sun.proprietary: com.sun.nio.file.ExtendedOpenOption",
"1 warning"
);
List<String> versions = new ArrayList<>();
Path javaHome = FileSystems.getDefault().getPath(System.getProperty("java.home"));
Path thisSystemModules = javaHome.resolve("lib").resolve("modules");
if (Files.isRegularFile(thisSystemModules)) {
//only use -source 8 when running on full JDK images (not on the exploded JDK), as the
//classfiles are not considered to be part of JRT image when running with -source 8:
versions.add("8");
}
versions.addAll(List.of("11", "17", System.getProperty("java.specification.version")));
for (String version : versions) {
log = new JavacTask(tb)
.outdir(classes)
.options("-source", version,
"-XDrawDiagnostics",
"-Xlint:-options")
.sources("""
public class Test {
com.sun.nio.file.ExtendedOpenOption o;
}
""")
.run()
.writeAll()
.getOutputLines(Task.OutputKind.DIRECT);
if (!expected.equals(log)) {
throw new AssertionError("Unexpected output: " + log + ", version: " + version);
}
}
}
void runRelease() throws IOException {
Path root = Paths.get(".");
Path classes = root.resolve("classes");
Files.createDirectories(classes);
ToolBox tb = new ToolBox();
List<String> log;
List<String> expected;
expected = List.of(
"Test.java:2:21: compiler.warn.sun.proprietary: com.sun.nio.file.ExtendedOpenOption",
"1 warning"
);
for (String version : new String[] {"11", "17", System.getProperty("java.specification.version")}) {
log = new JavacTask(tb)
.outdir(classes)
.options("--release", version,
"-XDrawDiagnostics")
.sources("""
public class Test {
com.sun.nio.file.ExtendedOpenOption o;
}
""")
.run()
.writeAll()
.getOutputLines(Task.OutputKind.DIRECT);
if (!expected.equals(log)) {
throw new AssertionError("Unexpected output: " + log + ", version: " + version);
}
}
}
}