From f4fbbcc3fadf91b54d6e8e0de5ca74a176f28183 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Fri, 19 Oct 2012 00:44:52 +0400 Subject: [PATCH] Nullability warnings cleaned up with assertions --- .../jetbrains/jet/lang/types/lang/KotlinBuiltIns.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java index d75e2747d34..c47f203b535 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java @@ -253,7 +253,9 @@ public class KotlinBuiltIns { private void makePrimitive(PrimitiveType primitiveType) { ClassDescriptor clazz = (ClassDescriptor) getBuiltInsScope().getClassifier(primitiveType.getTypeName()); + assert clazz != null : "ClassDescriptor not found for " + primitiveType; ClassDescriptor arrayClazz = (ClassDescriptor) getBuiltInsScope().getClassifier(primitiveType.getArrayTypeName()); + assert arrayClazz != null : "Array ClassDescriptor not found for " + primitiveType; JetTypeImpl type = new JetTypeImpl(clazz); JetTypeImpl arrayType = new JetTypeImpl(arrayClazz); @@ -507,12 +509,16 @@ public class KotlinBuiltIns { @NotNull public ClassDescriptor getMapEntry() { - return DescriptorUtils.getInnerClassByName(getBuiltInClassByName("Map"), "Entry"); + ClassDescriptor classDescriptor = DescriptorUtils.getInnerClassByName(getBuiltInClassByName("Map"), "Entry"); + assert classDescriptor != null : "Can't find Map.Entry"; + return classDescriptor; } @NotNull public ClassDescriptor getMutableMapEntry() { - return DescriptorUtils.getInnerClassByName(getBuiltInClassByName("MutableMap"), "MutableEntry"); + ClassDescriptor classDescriptor = DescriptorUtils.getInnerClassByName(getBuiltInClassByName("MutableMap"), "MutableEntry"); + assert classDescriptor != null : "Can't find MutableMap.MutableEntry"; + return classDescriptor; } @NotNull