Revision: 9121
Author: [email protected]
Date: Tue Oct 19 17:35:25 2010
Log: Prevent non-null null types from appearing.
Contradiction in terms, and makes the compiler blow up.
http://gwt-code-reviews.appspot.com/1028801/show
Review by: [email protected]
http://code.google.com/p/google-web-toolkit/source/detail?r=9121
Modified:
/trunk/dev/core/src/com/google/gwt/dev/jjs/ast/JNonNullType.java
/trunk/dev/core/src/com/google/gwt/dev/jjs/ast/JProgram.java
=======================================
--- /trunk/dev/core/src/com/google/gwt/dev/jjs/ast/JNonNullType.java Thu
Aug 19 13:25:39 2010
+++ /trunk/dev/core/src/com/google/gwt/dev/jjs/ast/JNonNullType.java Tue
Oct 19 14:23:16 2010
@@ -25,7 +25,7 @@
JNonNullType(JReferenceType ref) {
super(ref.getSourceInfo(), ref.getName());
- assert ref.canBeNull();
+ assert !(ref instanceof JNullType);
this.ref = ref;
}
=======================================
--- /trunk/dev/core/src/com/google/gwt/dev/jjs/ast/JProgram.java Mon Aug 30
04:31:11 2010
+++ /trunk/dev/core/src/com/google/gwt/dev/jjs/ast/JProgram.java Tue Oct 19
14:23:16 2010
@@ -765,21 +765,18 @@
}
public JsonObject getCastableTypeMap(JReferenceType referenceType) {
-
// ensure jsonCastableTypeMaps has been initialized
// it might not have been if the CastNormalizer has not been run
if (castableTypeMaps == null) {
initTypeInfo(null);
}
-
JsonObject returnMap = castableTypeMaps.get(referenceType);
if (returnMap == null) {
// add a new empty map
returnMap = new JsonObject(createSourceInfoSynthetic(JProgram.class,
- "empty map"),
getJavaScriptObject());
+ "empty map"), getJavaScriptObject());
castableTypeMaps.put(referenceType, returnMap);
}
-
return returnMap;
}
@@ -1158,12 +1155,10 @@
public JPrimitiveType getTypeVoid() {
return JPrimitiveType.VOID;
}
-
+
public void initTypeInfo(
- IdentityHashMap<JReferenceType,JsonObject>
instantiatedTypeCastableTypeMaps) {
-
+ IdentityHashMap<JReferenceType, JsonObject>
instantiatedTypeCastableTypeMaps) {
castableTypeMaps = instantiatedTypeCastableTypeMaps;
-
if (castableTypeMaps == null || castableTypeMaps.size() == 0) {
castableTypeMaps = new IdentityHashMap<JReferenceType, JsonObject>();
}
@@ -1240,6 +1235,10 @@
if (type1 == type2) {
return type1;
}
+
+ if (type1 instanceof JNullType || type2 instanceof JNullType) {
+ return JNullType.INSTANCE;
+ }
if (type1 instanceof JNonNullType != type2 instanceof JNonNullType) {
// If either is non-nullable, the result should be non-nullable.
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
