From e42b5017ac22a4289119db7320995aad255a2b24 Mon Sep 17 00:00:00 2001
From: Stepan Koltsov <stepan.koltsov@jetbrains.com>
Date: Sat, 2 Jun 2012 03:08:55 +0400
Subject: [PATCH] codegen: ClosureAnnotator: restore assertion

---
 .../src/org/jetbrains/jet/codegen/ClosureAnnotator.java  | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ClosureAnnotator.java b/compiler/backend/src/org/jetbrains/jet/codegen/ClosureAnnotator.java
index e7eff87709b..6e157af197e 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ClosureAnnotator.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/ClosureAnnotator.java
@@ -256,7 +256,6 @@ public class ClosureAnnotator {
             // working around a problem with shallow analysis
             if (declarationDescriptor == null) return;
             ClassDescriptor classDescriptor = classDescriptorForFunctionDescriptor(declarationDescriptor, name);
-            recordName(classDescriptor, name);
             recordEnclosing(classDescriptor);
             classStack.push(classDescriptor);
             nameStack.push(classNameForClassDescriptor(classDescriptor).getInternalName());
@@ -294,7 +293,6 @@ public class ClosureAnnotator {
             else {
                 JvmClassName name = recordAnonymousClass(function);
                 ClassDescriptor classDescriptor = classDescriptorForFunctionDescriptor(functionDescriptor, name);
-                recordName(classDescriptor, name);
                 recordEnclosing(classDescriptor);
                 classStack.push(classDescriptor);
                 nameStack.push(name.getInternalName());
@@ -307,11 +305,8 @@ public class ClosureAnnotator {
 
     private void recordName(@NotNull ClassDescriptor classDescriptor, @NotNull JvmClassName name) {
         JvmClassName old = classNamesForClassDescriptor.put(classDescriptor, name);
-        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);
+        if (old != null) {
+            throw new IllegalStateException("rewrite at key " + classDescriptor);
         }
     }