From 0f166acf5d5eb53f5a32346ba5e5aad85f34b27d Mon Sep 17 00:00:00 2001 From: Stepan Koltsov Date: Sun, 8 Apr 2012 02:08:27 +0400 Subject: [PATCH] assertions in closure annotator --- .../org/jetbrains/jet/codegen/ClosureAnnotator.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ClosureAnnotator.java b/compiler/backend/src/org/jetbrains/jet/codegen/ClosureAnnotator.java index d8de214c778..91a827e4e66 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ClosureAnnotator.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ClosureAnnotator.java @@ -17,6 +17,7 @@ package org.jetbrains.jet.codegen; import com.intellij.util.containers.MultiMap; +import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.jet.lang.psi.*; @@ -257,9 +258,16 @@ public class ClosureAnnotator { classStack.pop(); } - private void recordName(ClassDescriptor classDescriptor, String name) { + // TODO: please insert either @NotNull or @Nullable here + // stepan.koltsov@ 2012-04-08 + private void recordName(ClassDescriptor classDescriptor, @NotNull String name) { String old = classNamesForClassDescriptor.put(classDescriptor, name); - assert old == null; + if (old == null) { + // TODO: fix this assertion + // previosly here was incorrect assert that was ignored without -ea + // stepan.koltsov@ 2012-04-08 + //throw new IllegalStateException("rewrite at key " + classDescriptor); + } } @Override