Mercurial > hg > release > icedtea7-forest-2.0 > langtools
changeset 1036:95fc7fd39be2
7041730: Regression: compiler accepts invalid cast from int to Byte
Summary: Implementation of cast conversion rules between primitive and boxed types is too liberal
Reviewed-by: jjg
| author | mcimadamore |
|---|---|
| date | Wed, 11 May 2011 13:12:11 +0200 |
| parents | a2d422d480cb |
| children | bdfa48f80c82 |
| files | src/share/classes/com/sun/tools/javac/code/Types.java test/tools/javac/types/BoxingConversionTest.java test/tools/javac/types/CastTest.java |
| diffstat | 3 files changed, 45 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/com/sun/tools/javac/code/Types.java Wed May 11 13:10:57 2011 +0200 +++ b/src/share/classes/com/sun/tools/javac/code/Types.java Wed May 11 13:12:11 2011 +0200 @@ -955,7 +955,9 @@ 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);
--- a/test/tools/javac/types/BoxingConversionTest.java Wed May 11 13:10:57 2011 +0200 +++ b/test/tools/javac/types/BoxingConversionTest.java Wed May 11 13:12:11 2011 +0200 @@ -118,7 +118,6 @@ 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
--- a/test/tools/javac/types/CastTest.java Wed May 11 13:10:57 2011 +0200 +++ b/test/tools/javac/types/CastTest.java Wed May 11 13:12:11 2011 +0200 @@ -42,12 +42,13 @@ */ 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 @@ /*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 @@ 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 @@ 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 static void main(String[] args) { - new CastTest().test(); + new CastTest().runTests(); } }