Move built-in companion intrinsics to core to reuse in reflection

compiler/backend/src/org/jetbrains/kotlin/codegen/FieldInfo.java

@@ -17,7 +17,7 @@
 package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicObjects;
+import org.jetbrains.kotlin.builtins.jvm.IntrinsicObjects;
 import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
 import org.jetbrains.kotlin.descriptors.ClassDescriptor;
 import org.jetbrains.kotlin.descriptors.ClassifierDescriptor;

compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java

@@ -21,12 +21,12 @@ import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
+import org.jetbrains.kotlin.builtins.jvm.IntrinsicObjects;
 import org.jetbrains.kotlin.codegen.*;
 import org.jetbrains.kotlin.codegen.binding.CodegenBinding;
 import org.jetbrains.kotlin.codegen.binding.MutableClosure;
 import org.jetbrains.kotlin.codegen.binding.PsiCodegenPredictor;
 import org.jetbrains.kotlin.codegen.context.CodegenContext;
-import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicObjects;
 import org.jetbrains.kotlin.codegen.signature.BothSignatureWriter;
 import org.jetbrains.kotlin.descriptors.*;
 import org.jetbrains.kotlin.descriptors.annotations.Annotated;
@@ -305,7 +305,7 @@ public class JetTypeMapper {
         }
 
         if (descriptor instanceof ClassDescriptor) {
-            FqName companionObjectMappedFqName = IntrinsicObjects.INSTANCE$.mapType((ClassDescriptor) descriptor);
+            FqName companionObjectMappedFqName = IntrinsicObjects.mapType((ClassDescriptor) descriptor);
             if (companionObjectMappedFqName != null) {
                 Type asmType = AsmUtil.asmTypeByFqNameWithoutInnerClasses(companionObjectMappedFqName);
                 if (signatureVisitor != null) {

core/descriptor.loader.java/src/org/jetbrains/kotlin/builtins/jvm/IntrinsicObjects.kt

@@ -14,19 +14,22 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.codegen.intrinsics
+package org.jetbrains.kotlin.builtins.jvm
 
-import org.jetbrains.kotlin.backend.common.builtins.CompanionObjectMapping
+import org.jetbrains.kotlin.builtins.CompanionObjectMapping
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
+import kotlin.platform.platformStatic
 
 public object IntrinsicObjects : CompanionObjectMapping() {
-    public fun mapType(classDescriptor: ClassDescriptor): FqName? {
+    private val kotlinJvmInternal = FqName("kotlin.jvm.internal")
+
+    public platformStatic fun mapType(classDescriptor: ClassDescriptor): FqName? {
         if (!hasMappingToObject(classDescriptor)) return null
 
         val containingDeclaration = classDescriptor.getContainingDeclaration()
         val name = Name.identifier(containingDeclaration.getName().asString() + "CompanionObject")
-        return FqName("kotlin.jvm.internal").child(name)
+        return kotlinJvmInternal.child(name)
     }
-}
+}

core/descriptors/src/org/jetbrains/kotlin/builtins/CompanionObjectMapping.kt

@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.backend.common.builtins
+package org.jetbrains.kotlin.builtins
 
-import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 
@@ -31,4 +30,4 @@ public abstract class CompanionObjectMapping {
                KotlinBuiltIns.getInstance().getString() == containingDeclaration ||
                KotlinBuiltIns.getInstance().getEnum() == containingDeclaration
     }
-}
+}

core/reflection.jvm/src/kotlin/reflect/jvm/internal/RuntimeTypeMapper.kt

@@ -17,6 +17,7 @@
 package kotlin.reflect.jvm.internal
 
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
+import org.jetbrains.kotlin.builtins.jvm.IntrinsicObjects
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor
 import org.jetbrains.kotlin.load.java.structure.reflect.classId
@@ -30,11 +31,12 @@ import org.jetbrains.kotlin.resolve.jvm.JvmClassName
 import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType
 import org.jetbrains.kotlin.types.JetType
 import org.jetbrains.kotlin.types.TypeUtils
+import kotlin.reflect.KotlinReflectionInternalError
 
 object RuntimeTypeMapper : JavaToKotlinClassMapBuilder() {
     private val kotlinFqNameToJvmDesc = linkedMapOf<FqName, String>()
     private val kotlinFqNameToJvmDescNullable = linkedMapOf<FqName, String>()
-    private val jvmDescToKotlinClassId = linkedMapOf<String, ClassId>();
+    private val jvmDescToKotlinClassId = linkedMapOf<String, ClassId>()
 
     init {
         init()
@@ -61,8 +63,9 @@ object RuntimeTypeMapper : JavaToKotlinClassMapBuilder() {
 
         val companionObject = kotlinDescriptor.getCompanionObjectDescriptor()
         if (companionObject != null) {
-            // TODO: see org.jetbrains.kotlin.codegen.intrinsics.IntrinsicObjects, extract that logic to core/
-            recordMapping(companionObject, "Lkotlin/jvm/internal/${kotlinDescriptor.getName().asString()}CompanionObject;")
+            val runtimeCompanionFqName = IntrinsicObjects.mapType(companionObject)
+                                         ?: throw KotlinReflectionInternalError("Failed to map intrinsic companion of $kotlinDescriptor")
+            recordMapping(companionObject, ClassId.topLevel(runtimeCompanionFqName).desc)
         }
     }
 
@@ -72,6 +75,7 @@ object RuntimeTypeMapper : JavaToKotlinClassMapBuilder() {
     }
 
     override fun register(javaClass: Class<*>, kotlinDescriptor: ClassDescriptor, direction: JavaToKotlinClassMapBuilder.Direction) {
+        // TODO: use direction correctly
         recordMapping(kotlinDescriptor, javaClass.classId.desc)
     }
 

js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/objects/objectsIntrinsics.kt

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.js.translate.intrinsic.objects
 
 import com.google.dart.compiler.backend.js.ast.JsArrayAccess
 import com.google.dart.compiler.backend.js.ast.JsExpression
-import org.jetbrains.kotlin.backend.common.builtins.CompanionObjectMapping
+import org.jetbrains.kotlin.builtins.CompanionObjectMapping
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.js.config.LibrarySourcesConfig
 import org.jetbrains.kotlin.js.translate.context.TranslationContext
@@ -56,4 +56,4 @@ object NO_OBJECT_INTRINSIC : ObjectIntrinsic {
             throw UnsupportedOperationException("ObjectIntrinsic#NO_OBJECT_INTRINSIC_#apply")
 
     override fun exists(): Boolean = false
-}
+}