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

8050106: JavaCompiler relies on inappropriate result from comparison

Browse Source 
Reviewed-by: darcy
This commit is contained in:
Jonathan Gibbons 2014-07-12 07:32:28 -07:00
parent 84e4fca0c8
commit 92884a5338
2 changed files with 142 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java
View File

@ -445,32 +445,22 @@ public class JavaCompiler {
boolean lintOptions =
options.isUnset(XLINT_CUSTOM, "-"+LintCategory.OPTIONS.option);
switch (source.compareTo(Source.MIN)) {
case -1:
log.error("option.removed.source", source.name, Source.MIN.name);
break;
case 0:
if (lintOptions) {
log.warning(LintCategory.OPTIONS, "option.obsolete.source", source.name);
obsoleteOptionFound = true;
}
break;
}
// check target version request
switch (target.compareTo(Target.MIN)) {
case -1:
log.error("option.removed.target", target.name, Target.MIN.name);
break;
case 0:
if (lintOptions) {
log.warning(LintCategory.OPTIONS, "option.obsolete.target", target.name);
obsoleteOptionFound = true;
}
break;
if (source.compareTo(Source.MIN) < 0) {
log.error("option.removed.source", source.name, Source.MIN.name);
} else if (source == Source.MIN && lintOptions) {
log.warning(LintCategory.OPTIONS, "option.obsolete.source", source.name);
obsoleteOptionFound = true;
}
if (obsoleteOptionFound)
log.warning(LintCategory.OPTIONS, "option.obsolete.suppression");
if (target.compareTo(Target.MIN) < 0) {
log.error("option.removed.target", target.name, Target.MIN.name);
} else if (target == Target.MIN && lintOptions) {
log.warning(LintCategory.OPTIONS, "option.obsolete.target", target.name);
obsoleteOptionFound = true;
}
if (obsoleteOptionFound)
log.warning(LintCategory.OPTIONS, "option.obsolete.suppression");
}
/* Switches:

128
langtools/test/tools/javac/versions/SourceTargetTest.java Normal file
View File

@ -0,0 +1,128 @@
/*
* Copyright (c) 2014, 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 8050106
* @summary JavaCompiler relies on inappropriate result from comparison
*/
import java.io.*;
import java.util.*;
import com.sun.tools.javac.code.Source;
import com.sun.tools.javac.jvm.Target;
public class SourceTargetTest {
public static void main(String... args) throws Exception {
SourceTargetTest t = new SourceTargetTest();
t.run();
}
public void run() throws Exception {
try (FileWriter out = new FileWriter("C.java")) {
out.write("class C { }");
}
for (Source s: Source.values()) {
test(s, null, "source", getKind(s, Source.MIN));
}
for (Target t: Target.values()) {
test(Source.values()[0], t, "target", getKind(t, Target.MIN));
}
if (errors > 0)
throw new Exception(errors + " errors occurred");
}
void test(Source s, Target t, String select, Kind kind) {
System.err.println("Test: source:" + s + ", target:" + t + " " + select + " " + kind);
List<String> args = new ArrayList<>();
args.add("-XDrawDiagnostics");
args.add("-source");
args.add(s.name);
if (t != null) {
args.add("-target");
args.add(t.name);
}
args.add("C.java");
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
int rc = com.sun.tools.javac.Main.compile(args.toArray(new String[args.size()]), pw);
pw.close();
String out = sw.toString();
System.err.print(out);
switch (kind) {
case INVALID:
check(out, "removed." + select, true);
check(out, "obsolete." + select, false);
break;
case OBSOLETE:
check(out, "removed." + select, false);
check(out, "obsolete." + select, true);
break;
case VALID:
check(out, "removed." + select, false);
check(out, "obsolete." + select, false);
break;
}
System.err.println();
}
enum Kind { INVALID, OBSOLETE, VALID };
<T extends Comparable<T>> Kind getKind(T t1, T t2) {
if (t1.compareTo(t2) < 0)
return Kind.INVALID;
else if (t1 == t2)
return Kind.OBSOLETE;
else
return Kind.VALID;
}
void check(String out, String text, boolean expect) {
if (out.contains(text) == expect) {
if (expect)
System.err.println("expected string found: " + text);
else
System.err.println("string not found, as expected: " + text);
} else {
if (expect)
error("expected string not found: " + text);
else
error("unexpected string found: " + text);
}
}
void error(String msg) {
System.err.println("error: " + msg);
errors++;
}
int errors;
}