From 83e8ecf1c323c86ce52850f7a131f96751f4f3ca Mon Sep 17 00:00:00 2001
From: Stepan Koltsov <stepan.koltsov@jetbrains.com>
Date: Fri, 13 Jan 2012 03:55:11 +0400
Subject: [PATCH] fix assert

* getText() throws
* make unconditional
---
 .../jet/lang/resolve/java/JavaDescriptorResolver.java        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
index 794e85c57e9..77e3be0c6f5 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
@@ -560,7 +560,10 @@ public class JavaDescriptorResolver {
     @NotNull
     private TypeParameterDescriptorInitialization resolveTypeParameter(@NotNull DeclarationDescriptor containingDeclaration, @NotNull PsiTypeParameter psiTypeParameter) {
         TypeParameterDescriptorInitialization typeParameterDescriptor = typeParameterDescriptorCache.get(psiTypeParameter);
-        assert typeParameterDescriptor != null : psiTypeParameter.getText();
+        if (typeParameterDescriptor == null) {
+            // TODO: report properly without crashing compiler
+            throw new IllegalStateException("failed to resolve type parameter: " + psiTypeParameter.getName());
+        }
         return typeParameterDescriptor;
     }