From 720c29e8f4fe2d923147adc76ad27604093ea90e Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Tue, 5 Jul 2016 20:17:52 +0300
Subject: [PATCH] Minor, fix NonExistentClass name and format

---
 .../kotlin/codegen/serialization/JvmSerializerExtension.java  | 3 ++-
 .../org/jetbrains/kotlin/load/kotlin/typeSignatureMapping.kt  | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmSerializerExtension.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmSerializerExtension.java
index 188628e78e0..2eb0852e865 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmSerializerExtension.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmSerializerExtension.java
@@ -26,6 +26,7 @@ import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor;
 import org.jetbrains.kotlin.load.java.JvmAbi;
 import org.jetbrains.kotlin.load.java.lazy.types.RawTypeImpl;
 import org.jetbrains.kotlin.load.kotlin.JavaFlexibleTypeDeserializer;
+import org.jetbrains.kotlin.load.kotlin.TypeSignatureMappingKt;
 import org.jetbrains.kotlin.name.ClassId;
 import org.jetbrains.kotlin.serialization.AnnotationSerializer;
 import org.jetbrains.kotlin.serialization.ProtoBuf;
@@ -164,7 +165,7 @@ public class JvmSerializerExtension extends SerializerExtension {
     @Override
     public void serializeErrorType(@NotNull KotlinType type, @NotNull ProtoBuf.Type.Builder builder) {
         if (classBuilderMode == ClassBuilderMode.KAPT) {
-            builder.setClassName(stringTable.getStringIndex("error.NonExistingClass"));
+            builder.setClassName(stringTable.getStringIndex(TypeSignatureMappingKt.NON_EXISTENT_CLASS_NAME));
             return;
         }
 
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/typeSignatureMapping.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/typeSignatureMapping.kt
index 98d931de7ec..0a75c16d8ba 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/typeSignatureMapping.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/typeSignatureMapping.kt
@@ -47,6 +47,8 @@ interface TypeMappingConfiguration<out T : Any> {
     fun processErrorType(kotlinType: KotlinType, descriptor: ClassDescriptor)
 }
 
+const val NON_EXISTENT_CLASS_NAME = "error/NonExistentClass"
+
 fun <T : Any> mapType(
         kotlinType: KotlinType,
         factory: JvmTypeFactory<T>,
@@ -81,7 +83,7 @@ fun <T : Any> mapType(
 
     when {
         ErrorUtils.isError(descriptor) -> {
-            val jvmType = factory.createObjectType("error/NonExistentClass")
+            val jvmType = factory.createObjectType(NON_EXISTENT_CLASS_NAME)
             typeMappingConfiguration.processErrorType(kotlinType, descriptor as ClassDescriptor)
             descriptorTypeWriter?.writeClass(jvmType)
             return jvmType