infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-09 18:08:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

7041730: Regression: compiler accepts invalid cast from int to Byte

Browse Source 
Implementation of cast conversion rules between primitive and boxed types is too liberal

Reviewed-by: jjg
This commit is contained in:
Maurizio Cimadamore 2011-05-11 13:12:11 +02:00
parent d3d252186b
commit 568387fe02
3 changed files with 45 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
langtools/src/share/classes/com/sun/tools/javac/code/Types.java
View File

@ -955,7 +955,9 @@ public class Types {
if (t.isPrimitive() != s.isPrimitive())
return allowBoxing && (
isConvertible(t, s, warn)
|| (allowObjectToPrimitiveCast && isConvertible(s, t, warn)));
|| (allowObjectToPrimitiveCast &&
s.isPrimitive() &&
isSubtype(boxedClass(s).type, t)));
if (warn != warnStack.head) {
try {
warnStack = warnStack.prepend(warn);

1
langtools/test/tools/javac/types/BoxingConversionTest.java
View File

@ -118,7 +118,6 @@ public class BoxingConversionTest extends TypeHarness {
static final Result T = Result.OK_BOTH;
static final Result F = Result.FAIL_BOTH;
static final Result A = Result.OK_ASSIGN_ONLY;
static final Result X = Result.FAIL_BOTH.FAIL_BOTH;
Result[][] results1 = {
//byte, short, int, long, float, double, char, bool, Byte, Short, Integer, Long, Float, Double, Character, Boolean

50
langtools/test/tools/javac/types/CastTest.java
View File

@ -42,12 +42,13 @@ import static com.sun.tools.javac.code.Flags.*;
*/
public class CastTest extends TypeHarness {
Type[] allTypes;
Type[] types_no_boxing;
Type[] types_boxing;
static final boolean T = true;
static final boolean F = false;
boolean[][] cast_result = {
boolean[][] cast_result_no_boxing = {
//byte, short, int, long, float, double, char, bool, C, +C, I, T, byte[], short[], int[], long[], float[], double[], char[], bool[], C[], +C[], I[], T[]
/*byte*/ { T , T , T , T , T , T , T , F , F, F , F, F, F , F , F , F , F , F , F , F , F , F , F , F },
/*short*/ { T , T , T , T , T , T , T , F , F, F , F, F, F , F , F , F , F , F , F , F , F , F , F , F },
@ -74,6 +75,25 @@ public class CastTest extends TypeHarness {
/*I[]*/ { F , F , F , F , F , F , F , F , F, F , F, T, F , F , F , F , F , F , F , F , T , F , T , T },
/*T[]*/ { F , F , F , F , F , F , F , F , F, F , F, T, F , F , F , F , F , F , F , F , T , T , T , T }};
boolean[][] cast_result_boxing = {
//byte, short, int, long, float, double, char, bool, Byte, Short, Integer, Long, Float, Double, Character, Boolean, Object
/*byte*/ { T , T , T , T , T , T , T , F , T , F , F , F , F , F , F , F , T },
/*short*/ { T , T , T , T , T , T , T , F , F , T , F , F , F , F , F , F , T },
/*int*/ { T , T , T , T , T , T , T , F , F , F , T , F , F , F , F , F , T },
/*long*/ { T , T , T , T , T , T , T , F , F , F , F , T , F , F , F , F , T },
/*float*/ { T , T , T , T , T , T , T , F , F , F , F , F , T , F , F , F , T },
/*double*/ { T , T , T , T , T , T , T , F , F , F , F , F , F , T , F , F , T },
/*char*/ { T , T , T , T , T , T , T , F , F , F , F , F , F , F , T , F , T },
/*bool*/ { F , F , F , F , F , F , F , T , F , F , F , F , F , F , F , T , T },
/*Byte*/ { T , T , T , T , T , T , F , F , T , F , F , F , F , F , F , F , T },
/*Short*/ { F , T , T , T , T , T , F , F , F , T , F , F , F , F , F , F , T },
/*Integer*/ { F , F , T , T , T , T , F , F , F , F , T , F , F , F , F , F , T },
/*Long*/ { F , F , F , T , T , T , F , F , F , F , F , T , F , F , F , F , T },
/*Float*/ { F , F , F , F , T , T , F , F , F , F , F , F , T , F , F , F , T },
/*Double*/ { F , F , F , F , F , T , F , F , F , F , F , F , F , T , F , F , T },
/*Character*/ { F , F , T , T , T , T , T , F , F , F , F , F , F , F , T , F , T },
/*Boolean*/ { F , F , F , F , F , F , F , T , F , F , F , F , F , F , F , T , T },
/*Object*/ { T , T , T , T , T , T , T , T , T , T , T , T , T , T , T , T , T }};
CastTest() {
Type[] primitiveTypes = {
predef.byteType,
@ -85,6 +105,15 @@ public class CastTest extends TypeHarness {
predef.charType,
predef.booleanType };
Type[] boxedTypes = new Type[primitiveTypes.length + 1];
for (int i = 0 ; i < primitiveTypes.length ; i++) {
boxedTypes[i] = box(primitiveTypes[i]);
}
boxedTypes[primitiveTypes.length] = predef.objectType;
types_boxing = join(Type.class, primitiveTypes, boxedTypes);
Type[] referenceTypes = {
fac.Class(),
fac.Class(FINAL),
@ -97,17 +126,22 @@ public class CastTest extends TypeHarness {
arrayTypes[idx++] = fac.Array(t);
}
allTypes = join(Type.class, primitiveTypes, referenceTypes, arrayTypes);
types_no_boxing = join(Type.class, primitiveTypes, referenceTypes, arrayTypes);
}
void test() {
for (int i = 0; i < allTypes.length ; i++) {
for (int j = 0; j < allTypes.length ; j++) {
assertCastable(allTypes[i], allTypes[j], cast_result[i][j]);
void test(Type[] all_types, boolean[][] cast_result) {
for (int i = 0; i < all_types.length ; i++) {
for (int j = 0; j < all_types.length ; j++) {
assertCastable(all_types[i], all_types[j], cast_result[i][j]);
}
}
}
void runTests() {
test(types_no_boxing, cast_result_no_boxing);
test(types_boxing, cast_result_boxing);
}
@SuppressWarnings("unchecked")
<T> T[] join(Class<T> type, T[]... args) {
int totalLength = 0;
@ -124,6 +158,6 @@ public class CastTest extends TypeHarness {
}
public static void main(String[] args) {
new CastTest().test();
new CastTest().runTests();
}
}