Introduce fictitious numbered Function class descriptors

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

@@ -0,0 +1,28 @@
+/*
+ * 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.serialization.deserialization
+
+import org.jetbrains.kotlin.descriptors.ClassDescriptor
+import org.jetbrains.kotlin.name.ClassId
+
+public interface ClassDescriptorFactory {
+    public fun createClass(classId: ClassId): ClassDescriptor?
+
+    public object EMPTY : ClassDescriptorFactory {
+        override fun createClass(classId: ClassId): ClassDescriptor? = null
+    }
+}

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

@@ -16,23 +16,26 @@
 
 package org.jetbrains.kotlin.serialization.deserialization
 
-import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor
+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) {
-    private val classes: (ClassKey) -> DeserializedClassDescriptor? =
+    private val classes: (ClassKey) -> ClassDescriptor? =
             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): DeserializedClassDescriptor? =
+    public fun deserializeClass(classId: ClassId, classData: ClassData? = null): ClassDescriptor? =
             classes(ClassKey(classId, classData))
 
-    private fun createClass(key: ClassKey): DeserializedClassDescriptor? {
+    private fun createClass(key: ClassKey): ClassDescriptor? {
         val classId = key.classId
+        components.fictitiousClassDescriptorFactory.createClass(classId)?.let { return it }
+
         val classData = key.classData ?: components.classDataFinder.findClassData(classId) ?: return null
         val outerContext = if (classId.isNestedClass()) {
-            deserializeClass(classId.getOuterClassId())?.c ?: return null
+            (deserializeClass(classId.getOuterClassId()) as? DeserializedClassDescriptor)?.c ?: return null
         }
         else {
             val fragments = components.packageFragmentProvider.getPackageFragments(classId.getPackageFqName())

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

@@ -16,12 +16,12 @@
 
 package org.jetbrains.kotlin.serialization.deserialization
 
-import org.jetbrains.kotlin.storage.StorageManager
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.descriptors.*
+import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant
-import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
+import org.jetbrains.kotlin.serialization.ProtoBuf
+import org.jetbrains.kotlin.storage.StorageManager
 
 public class DeserializationComponents(
         public val storageManager: StorageManager,
@@ -30,7 +30,8 @@ public class DeserializationComponents(
         public val annotationAndConstantLoader: AnnotationAndConstantLoader<AnnotationDescriptor, CompileTimeConstant<*>>,
         public val packageFragmentProvider: PackageFragmentProvider,
         public val localClassResolver: LocalClassResolver,
-        public val flexibleTypeCapabilitiesDeserializer: FlexibleTypeCapabilitiesDeserializer
+        public val flexibleTypeCapabilitiesDeserializer: FlexibleTypeCapabilitiesDeserializer,
+        public val fictitiousClassDescriptorFactory: ClassDescriptorFactory
 ) {
     public val classDeserializer: ClassDeserializer = ClassDeserializer(this)