NPE fix for .toRType() return value

panchenko · panchenko · commit a49b32e3d646 · 2012-09-27T18:39:22.000+07:00
diff --git a/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/ti/TypeInferencerVisitor.java b/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/ti/TypeInferencerVisitor.java
@@ -505,7 +505,8 @@ private JSTypeSet evaluateReturnType(JSType type,
 			List<IRType> params = new ArrayList<IRType>();
 			final ParameterizedType parameterized = (ParameterizedType) type;
 			for (JSType param : parameterized.getActualTypeArguments()) {
-				params.add(evaluateReturnType(param, captures).toRType());
+				final IRType r = evaluateReturnType(param, captures).toRType();
+				params.add(r != null ? r : RTypes.none());
 			}
 			return JSTypeSet.singleton(RTypes.simple(getContext().parameterize(
 					parameterized.getTarget(), params)));
diff --git a/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/javascript/typeinfo/RTypes.java b/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/javascript/typeinfo/RTypes.java
@@ -185,7 +185,7 @@ public static IRType union(Collection<IRType> targets) {
 	 * Creates new instance of the array type with the specified itemType.
 	 */
 	public static IRArrayType arrayOf(final IRType itemType) {
-		return new RArrayType(itemType);
+		return new RArrayType(itemType != null ? itemType : none());
 	}
 
 	public static IRArrayType arrayOf(ITypeSystem typeSystem,

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ public static IRType union(Collection<IRType> targets) {`
`185`	`185`	`* Creates new instance of the array type with the specified itemType.`
`186`	`186`	`*/`
`187`	`187`	`public static IRArrayType arrayOf(final IRType itemType) {`
`188`		`- return new RArrayType(itemType);`
	`188`	`+ return new RArrayType(itemType != null ? itemType : none());`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`public static IRArrayType arrayOf(ITypeSystem typeSystem,`