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

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

@@ -0,0 +1,35 @@
+/*
+ * 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.builtins.jvm
+
+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() {
+    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 kotlinJvmInternal.child(name)
+    }
+}

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

@@ -0,0 +1,33 @@
+/*
+ * 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.builtins
+
+import org.jetbrains.kotlin.descriptors.ClassDescriptor
+import org.jetbrains.kotlin.resolve.DescriptorUtils
+
+public abstract class CompanionObjectMapping {
+    public fun hasMappingToObject(classDescriptor: ClassDescriptor): Boolean {
+        if (!DescriptorUtils.isCompanionObject(classDescriptor)) return false
+
+        val containingDeclaration = classDescriptor.getContainingDeclaration()
+        if (containingDeclaration !is ClassDescriptor) return false
+
+        return KotlinBuiltIns.isPrimitiveType(containingDeclaration.getDefaultType()) ||
+               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)
     }