Save class file to deserialized descriptor

core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.java

@@ -24,7 +24,9 @@ import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor;
 import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader;
 import org.jetbrains.kotlin.name.Name;
 import org.jetbrains.kotlin.resolve.scopes.JetScope;
+import org.jetbrains.kotlin.serialization.ClassData;
 import org.jetbrains.kotlin.serialization.PackageData;
+import org.jetbrains.kotlin.serialization.deserialization.ClassDataProvider;
 import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents;
 import org.jetbrains.kotlin.serialization.deserialization.ErrorReporter;
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPackageMemberScope;
@@ -55,9 +57,10 @@ public final class DeserializedDescriptorResolver {
     public ClassDescriptor resolveClass(@NotNull KotlinJvmBinaryClass kotlinClass) {
         String[] data = readData(kotlinClass, CLASS);
         if (data != null) {
-            return components.getClassDeserializer().deserializeClass(
-                    kotlinClass.getClassId(), JvmProtoBufUtil.readClassDataFrom(data)
-            );
+            ClassData classData = JvmProtoBufUtil.readClassDataFrom(data);
+            KotlinJvmBinarySourceElement sourceElement = new KotlinJvmBinarySourceElement(kotlinClass);
+            ClassDataProvider classDataProvider = new ClassDataProvider(classData, sourceElement);
+            return components.getClassDeserializer().deserializeClass(kotlinClass.getClassId(), classDataProvider);
         }
         return null;
     }

core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JavaClassDataFinder.kt

@@ -33,6 +33,6 @@ public class JavaClassDataFinder(
         }
         val data = deserializedDescriptorResolver.readData(kotlinJvmBinaryClass, KotlinClassHeader.Kind.CLASS) ?: return null
         val classData = JvmProtoBufUtil.readClassDataFrom(data)
-        return ClassDataProvider(classData)
+        return ClassDataProvider(classData, KotlinJvmBinarySourceElement(kotlinJvmBinaryClass))
     }
 }

core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinarySourceElement.kt

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.load.kotlin
+
+import org.jetbrains.kotlin.descriptors.SourceElement
+
+public class KotlinJvmBinarySourceElement(public val binaryClass: KotlinJvmBinaryClass) : SourceElement

core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDeserializer.kt

@@ -18,7 +18,6 @@ package org.jetbrains.kotlin.serialization.deserialization
 
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.name.ClassId
-import org.jetbrains.kotlin.serialization.ClassData
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor
 
 public class ClassDeserializer(private val components: DeserializationComponents) {
@@ -26,17 +25,16 @@ public class ClassDeserializer(private val components: DeserializationComponents
             components.storageManager.createMemoizedFunctionWithNullableValues { key -> createClass(key) }
 
     // Additional ClassData parameter is needed to avoid calling ClassDataFinder#findClassData() if it is already computed at call site
-    public fun deserializeClass(classId: ClassId, classData: ClassData? = null): ClassDescriptor? =
-            classes(ClassKey(classId, classData))
+    public fun deserializeClass(classId: ClassId, classDataProvider: ClassDataProvider? = null): ClassDescriptor? =
+            classes(ClassKey(classId, classDataProvider))
 
     private fun createClass(key: ClassKey): ClassDescriptor? {
         val classId = key.classId
         components.fictitiousClassDescriptorFactory.createClass(classId)?.let { return it }
-
-        var classData = key.classData ?: run {
-            val classDataProvider = components.classDataFinder.findClassData(classId)
-            classDataProvider?.classData
-        } ?: return null
+        val classDataProvider = key.classDataProvider
+                                ?: components.classDataFinder.findClassData(classId)
+                                ?: return null
+        val classData = classDataProvider.classData
 
         val outerContext = if (classId.isNestedClass()) {
             val outerClass = deserializeClass(classId.getOuterClassId()) as? DeserializedClassDescriptor ?: return null
@@ -59,11 +57,12 @@ public class ClassDeserializer(private val components: DeserializationComponents
             components.createContext(fragment, classData.getNameResolver())
         }
 
-        return DeserializedClassDescriptor(outerContext, classData.getClassProto(), classData.getNameResolver())
+        return DeserializedClassDescriptor(outerContext, classData.getClassProto(), classData.getNameResolver(),
+                                           classDataProvider.sourceElement)
     }
 
-    private data class ClassKey(val classId: ClassId, classData: ClassData?) {
+    private data class ClassKey(val classId: ClassId, classDataProvider: ClassDataProvider?) {
         // This property is not declared in the constructor because it shouldn't participate in equals/hashCode
-        val classData: ClassData? = classData
+        val classDataProvider: ClassDataProvider? = classDataProvider
     }
 }

core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt

@@ -42,7 +42,8 @@ import java.util.LinkedHashSet
 public class DeserializedClassDescriptor(
         outerContext: DeserializationContext,
         val classProto: ProtoBuf.Class,
-        nameResolver: NameResolver
+        nameResolver: NameResolver,
+        private val sourceElement: SourceElement
 ) : ClassDescriptor, AbstractClassDescriptor(
         outerContext.storageManager,
         nameResolver.getClassId(classProto.getFqName()).getShortClassName()
@@ -145,7 +146,7 @@ public class DeserializedClassDescriptor(
 
     override fun toString() = "deserialized class ${getName().toString()}" // not using descriptor render to preserve laziness
 
-    override fun getSource() = SourceElement.NO_SOURCE
+    override fun getSource() = sourceElement
 
     private inner class DeserializedClassTypeConstructor : AbstractClassTypeConstructor() {
         private val supertypes = computeSuperTypes()