From 16d56355c38e63ed0ddf1ef4a7a872b3bfea00a4 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Tue, 20 Oct 2015 20:02:44 +0300
Subject: [PATCH] Special crafting of ClassId when implClassName is nested
 DefaultImpls

---
 .../AbstractBinaryClassAnnotationAndConstantLoader.kt    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt
index 43ab355a02c..0eb1bc2b28d 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt
@@ -18,8 +18,10 @@ package org.jetbrains.kotlin.load.kotlin
 
 import com.google.protobuf.MessageLite
 import org.jetbrains.kotlin.descriptors.SourceElement
+import org.jetbrains.kotlin.load.java.JvmAbi
 import org.jetbrains.kotlin.load.java.JvmAnnotationNames
 import org.jetbrains.kotlin.name.ClassId
+import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.*
@@ -198,7 +200,12 @@ public abstract class AbstractBinaryClassAnnotationAndConstantLoader<A : Any, C
 
                 if (implClassName != null) {
                     // TODO: store accurate name for nested traits
-                    return kotlinClassFinder.findKotlinClass(ClassId(classId.packageFqName, implClassName))
+                    val implClassId =
+                        if (implClassName.asString().endsWith(JvmAbi.DEFAULT_IMPLS_SUFFIX))
+                            ClassId(classId.packageFqName, FqName(implClassName.asString().replace(JvmAbi.DEFAULT_IMPLS_SUFFIX, "." + JvmAbi.DEFAULT_IMPLS_CLASS_NAME)), false)
+                        else
+                            ClassId(classId.packageFqName, implClassName)
+                    return kotlinClassFinder.findKotlinClass(implClassId)
                 }
 
                 if (isStaticFieldInOuter && classId.isNestedClass) {