Drop package facades:

- getting rid of package facades in InlineCodegen & related stuff.
Provide binary source element to top-level package members.

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

@@ -16,13 +16,19 @@
 
 package org.jetbrains.kotlin.load.java.descriptors
 
+import com.google.protobuf.MessageLite
 import org.jetbrains.kotlin.descriptors.CallableDescriptor
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor
 import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl
 import org.jetbrains.kotlin.load.java.lazy.descriptors.LazyJavaStaticClassScope
+import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.descriptorUtil.getSuperClassNotAny
 import org.jetbrains.kotlin.resolve.descriptorUtil.module
+import org.jetbrains.kotlin.serialization.ProtoBuf
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor
+import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf
 import org.jetbrains.kotlin.types.JetType
 
 fun copyValueParameters(
@@ -60,3 +66,22 @@ fun ClassDescriptor.getParentJavaStaticClassScope(): LazyJavaStaticClassScope? {
 
     return staticScope
 }
+
+fun DeserializedCallableMemberDescriptor.getImplClassName(): Name? =
+        getImplClassName(this.proto, this.nameResolver)
+
+fun getImplClassName(proto: MessageLite, nameResolver: NameResolver): Name? =
+        when (proto) {
+            is ProtoBuf.Constructor ->
+                null
+            is ProtoBuf.Function ->
+                if (proto.hasExtension(JvmProtoBuf.methodImplClassName))
+                    proto.getExtension(JvmProtoBuf.methodImplClassName)
+                else null
+            is ProtoBuf.Property ->
+                if (proto.hasExtension(JvmProtoBuf.propertyImplClassName))
+                    proto.getExtension(JvmProtoBuf.propertyImplClassName)
+                else null
+            else ->
+                error("Unknown message: $proto")
+        }?.let { nameResolver.getName(it) }

core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageFragment.kt

@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.descriptors.impl.PackageFragmentDescriptorImpl
 import org.jetbrains.kotlin.load.java.lazy.LazyJavaResolverContext
 import org.jetbrains.kotlin.load.java.structure.JavaClass
 import org.jetbrains.kotlin.load.java.structure.JavaPackage
+import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryPackageSourceElement
 import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinarySourceElement
 import org.jetbrains.kotlin.load.kotlin.PackageClassUtils
 import org.jetbrains.kotlin.name.ClassId
@@ -57,8 +58,6 @@ class LazyJavaPackageFragment(
     override fun toString() = "lazy java package fragment: $fqName"
 
     override fun getSource(): SourceElement {
-        // TODO source element for a bunch of Kotlin binary classes containing members of the same package
-        val representativeClass = kotlinBinaryClasses.firstOrNull() ?: return SourceElement.NO_SOURCE
-        return KotlinJvmBinarySourceElement(representativeClass)
+        return KotlinJvmBinaryPackageSourceElement(jPackage, kotlinBinaryClasses)
     }
 }

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

@@ -0,0 +1,49 @@
+/*
+ * 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
+import org.jetbrains.kotlin.descriptors.SourceFile
+import org.jetbrains.kotlin.load.java.descriptors.getImplClassName
+import org.jetbrains.kotlin.load.java.structure.JavaPackage
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor
+
+
+class KotlinJvmBinaryPackageSourceElement(
+        private val jPackage: JavaPackage,
+        kotlinBinaryClasses: List<KotlinJvmBinaryClass>
+) : SourceElement {
+    private val implClassNameToBinaryClass = run {
+        val result = hashMapOf<String, KotlinJvmBinaryClass>()
+        for (kotlinBinaryClass in kotlinBinaryClasses) {
+            result[kotlinBinaryClass.classId.shortClassName.asString()] = kotlinBinaryClass
+        }
+        result
+    }
+
+    override fun toString(): String = "Binary package ${jPackage.getFqName()}: ${implClassNameToBinaryClass.keys}"
+    override fun getContainingFile(): SourceFile = SourceFile.NO_SOURCE_FILE
+
+    public fun getRepresentativeBinaryClass(): KotlinJvmBinaryClass {
+        return implClassNameToBinaryClass.values.first()
+    }
+
+    public fun getContainingBinaryClass(descriptor: DeserializedCallableMemberDescriptor): KotlinJvmBinaryClass? {
+        val name = descriptor.getImplClassName() ?: return null
+        return implClassNameToBinaryClass[name.asString()]
+    }
+}