infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 12:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

8348410: Preview flag not checked during compilation resulting in runtime crash

Browse Source 
Co-authored-by: Aggelos Biboudis <abimpoudis@openjdk.org>
Reviewed-by: jlahoda, mcimadamore
This commit is contained in:
Archie Cobbs 2025-05-12 14:42:27 +00:00
parent 7ae52ce572
commit f5525ecf58
2 changed files with 186 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
View File

@ -1697,6 +1697,7 @@ public class Attr extends JCTree.Visitor {
List<JCCase> cases,
BiConsumer<JCCase, Env<AttrContext>> attribCase) {
Type seltype = attribExpr(selector, env);
Type seltypeUnboxed = types.unboxedTypeOrType(seltype);
Env<AttrContext> switchEnv =
env.dup(switchTree, env.info.dup(env.info.scope.dup()));
@ -1704,7 +1705,7 @@ public class Attr extends JCTree.Visitor {
try {
boolean enumSwitch = (seltype.tsym.flags() & Flags.ENUM) != 0;
boolean stringSwitch = types.isSameType(seltype, syms.stringType);
boolean booleanSwitch = types.isSameType(types.unboxedTypeOrType(seltype), syms.booleanType);
boolean booleanSwitch = types.isSameType(seltypeUnboxed, syms.booleanType);
boolean errorEnumSwitch = TreeInfo.isErrorEnumSwitch(selector, cases);
boolean intSwitch = types.isAssignable(seltype, syms.intType);
boolean patternSwitch;
@ -1802,9 +1803,12 @@ public class Attr extends JCTree.Visitor {
}
}
else {
if (!stringSwitch && !intSwitch &&
!((pattype.getTag().isInSuperClassesOf(LONG) || pattype.getTag().equals(BOOLEAN)) &&
types.isSameType(types.unboxedTypeOrType(seltype), pattype))) {
boolean isLongFloatDoubleOrBooleanConstant =
pattype.getTag().isInSuperClassesOf(LONG) || pattype.getTag().equals(BOOLEAN);
if (isLongFloatDoubleOrBooleanConstant) {
preview.checkSourceLevel(label.pos(), Feature.PRIMITIVE_PATTERNS);
}
if (!stringSwitch && !intSwitch && !(isLongFloatDoubleOrBooleanConstant && types.isSameType(seltypeUnboxed, pattype))) {
log.error(label.pos(), Errors.ConstantLabelNotCompatible(pattype, seltype));
} else if (!constants.add(pattype.constValue())) {
log.error(c.pos(), Errors.DuplicateCaseLabel);

178
test/langtools/tools/javac/patterns/PrimitivePatternsSwitchRequirePreview.java Normal file
View File

@ -0,0 +1,178 @@
/*
* Copyright (c) 2025, 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 8348410
* @summary Ensure --enable-preview is required for primitive switch on a boxed expression
* @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 PrimitivePatternsSwitchRequirePreview
*/
import java.nio.file.Path;
import java.util.List;
import java.util.Objects;
import toolbox.JavacTask;
import toolbox.Task.Expect;
import toolbox.Task.OutputKind;
import toolbox.TestRunner;
import toolbox.ToolBox;
public class PrimitivePatternsSwitchRequirePreview extends TestRunner {
ToolBox tb;
public PrimitivePatternsSwitchRequirePreview() {
super(System.err);
tb = new ToolBox();
}
public static void main(String[] args) throws Exception {
PrimitivePatternsSwitchRequirePreview t = new PrimitivePatternsSwitchRequirePreview();
t.runTests();
}
@Test
public void testBoolean() throws Exception {
String code = """
class C {
public static void testBoolean(Boolean value) {
switch (value) {
case true -> System.out.println("true");
default -> System.out.println("false");
}
}
}
""";
Path curPath = Path.of(".");
List<String> actual = new JavacTask(tb)
.options("-XDrawDiagnostics", "-XDdev", "-XDshould-stop.at=FLOW")
.sources(code)
.outdir(curPath)
.run(Expect.FAIL)
.getOutputLines(OutputKind.DIRECT);
List<String> expected = List.of(
"C.java:4:16: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.primitive.patterns)",
"1 error"
);
if (!Objects.equals(actual, expected)) {
error("Expected: " + expected + ", but got: " + actual);
}
}
@Test
public void testLong() throws Exception {
String code = """
class C {
public static void testLong(Long value) {
switch (value) {
case 0L -> System.out.println("zero");
default -> System.out.println("non-zero");
}
}
}
""";
Path curPath = Path.of(".");
List<String> actual = new JavacTask(tb)
.options("-XDrawDiagnostics", "-XDdev", "-XDshould-stop.at=FLOW")
.sources(code)
.outdir(curPath)
.run(Expect.FAIL)
.getOutputLines(OutputKind.DIRECT);
List<String> expected = List.of(
"C.java:4:17: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.primitive.patterns)",
"1 error"
);
if (!Objects.equals(actual, expected)) {
error("Expected: " + expected + ", but got: " + actual);
}
}
@Test
public void testFloat() throws Exception {
String code = """
class C {
public static void testFloat(Float value) {
switch (value) {
case 0f -> System.out.println("zero");
default -> System.out.println("non-zero");
}
}
}
""";
Path curPath = Path.of(".");
List<String> actual = new JavacTask(tb)
.options("-XDrawDiagnostics", "-XDdev", "-XDshould-stop.at=FLOW")
.sources(code)
.outdir(curPath)
.run(Expect.FAIL)
.getOutputLines(OutputKind.DIRECT);
List<String> expected = List.of(
"C.java:4:15: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.primitive.patterns)",
"1 error"
);
if (!Objects.equals(actual, expected)) {
error("Expected: " + expected + ", but got: " + actual);
}
}
@Test
public void testDouble() throws Exception {
String code = """
class C {
public static void testDouble(Long value) {
switch (value) {
case 0L -> System.out.println("zero");
default -> System.out.println("non-zero");
}
}
}
""";
Path curPath = Path.of(".");
List<String> actual = new JavacTask(tb)
.options("-XDrawDiagnostics", "-XDdev", "-XDshould-stop.at=FLOW")
.sources(code)
.outdir(curPath)
.run(Expect.FAIL)
.getOutputLines(OutputKind.DIRECT);
List<String> expected = List.of(
"C.java:4:16: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.primitive.patterns)",
"1 error"
);
if (!Objects.equals(actual, expected)) {
error("Expected: " + expected + ", but got: " + actual);
}
}
}