From 00cad9df91b4b8192a3bc1a5e7d4be0856846d1f Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Thu, 19 Dec 2013 19:14:55 +0400
Subject: [PATCH] Include error type in error message

Everything besides it is almost always useless: descriptor is usually
ERROR_CLASS, declarations are usually nulls because they come from a different
module
---
 .../jet/codegen/state/JetTypeMapper.java      | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java b/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java
index 3fdbd68a2b9..c7894fd7ce8 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java
@@ -264,7 +264,7 @@ public class JetTypeMapper extends BindingTraceAware {
 
         if (ErrorUtils.isError(descriptor)) {
             if (classBuilderMode != ClassBuilderMode.LIGHT_CLASSES) {
-                throw new IllegalStateException(generateErrorMessageForErrorType(descriptor));
+                throw new IllegalStateException(generateErrorMessageForErrorType(jetType, descriptor));
             }
             Type asmType = Type.getObjectType("error/NonExistentClass");
             if (signatureVisitor != null) {
@@ -319,7 +319,8 @@ public class JetTypeMapper extends BindingTraceAware {
         return Type.getObjectType(getAsmType(bindingTrace, descriptor).getInternalName() + JvmAbi.TRAIT_IMPL_SUFFIX);
     }
 
-    private String generateErrorMessageForErrorType(@NotNull DeclarationDescriptor descriptor) {
+    @NotNull
+    private String generateErrorMessageForErrorType(@NotNull JetType type, @NotNull DeclarationDescriptor descriptor) {
         PsiElement declarationElement = BindingContextUtils.descriptorToDeclaration(bindingContext, descriptor);
         PsiElement parentDeclarationElement = null;
         if (declarationElement != null) {
@@ -329,13 +330,16 @@ public class JetTypeMapper extends BindingTraceAware {
             }
         }
 
-        return String.format("Error types are not allowed when classBuilderMode = %s. Descriptor: %s. For declaration %s:%s in %s:%s",
-                      classBuilderMode,
-                      descriptor,
-                      declarationElement,
-                      declarationElement != null ? declarationElement.getText() : "null",
-                      parentDeclarationElement,
-                      parentDeclarationElement != null ? parentDeclarationElement.getText() : "null");
+        return String.format("Error types are not allowed when classBuilderMode = %s. " +
+                             "Type: %s (%s). Descriptor: %s. For declaration %s:%s in %s:%s",
+                             classBuilderMode,
+                             type,
+                             type.getClass().getSimpleName(),
+                             descriptor,
+                             declarationElement,
+                             declarationElement != null ? declarationElement.getText() : "null",
+                             parentDeclarationElement,
+                             parentDeclarationElement != null ? parentDeclarationElement.getText() : "null");
     }
 
     private void writeGenericType(