Nullability of dynamic types

2014-11-10 00:12:55 +02:00
parent e0bd881c1e
commit d5932e1a33
6 changed files with 33 additions and 8 deletions
@@ -199,8 +199,9 @@ public class TypeResolver(
            }

            override fun visitNullableType(nullableType: JetNullableType) {
-                val baseType = resolveTypeElement(c, annotations, nullableType.getInnerType())
-                if (baseType.isNullable()) {
+                val innerType = nullableType.getInnerType()
+                val baseType = resolveTypeElement(c, annotations, innerType)
+                if (baseType.isNullable() || innerType is JetNullableType || innerType is JetDynamicType) {
                    c.trace.report(REDUNDANT_NULLABLE.on(nullableType))
                }
                else if (!baseType.isBare() && TypeUtils.hasNullableSuperType(baseType.getActualType())) {