Rename CompanionObjectMapping.hasMappingToObject -> isMappedIntrinsicCompanionObject

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

@@ -103,6 +103,6 @@ public final class JvmAbi {
     public static boolean isCompanionObjectWithBackingFieldsInOuter(@NotNull DeclarationDescriptor companionObject) {
         return isCompanionObject(companionObject) &&
                isClassOrEnumClass(companionObject.getContainingDeclaration()) &&
-               !CompanionObjectMapping.INSTANCE.hasMappingToObject((ClassDescriptor) companionObject);
+               !CompanionObjectMapping.INSTANCE.isMappedIntrinsicCompanionObject((ClassDescriptor) companionObject);
     }
 }

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

@@ -35,7 +35,7 @@ object CompanionObjectMapping {
     fun allClassesWithIntrinsicCompanions(): Set<FqName> =
             Collections.unmodifiableSet(classesFqNames)
 
-    fun hasMappingToObject(classDescriptor: ClassDescriptor): Boolean {
+    fun isMappedIntrinsicCompanionObject(classDescriptor: ClassDescriptor): Boolean {
         if (!DescriptorUtils.isCompanionObject(classDescriptor)) return false
         val fqName = DescriptorUtils.getFqName(classDescriptor.containingDeclaration)
         if (!fqName.isSafe) return false

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

@@ -128,7 +128,7 @@ internal class KClassImpl<T : Any>(override val jClass: Class<T>) :
         val descriptor = descriptor
         if (descriptor.kind != ClassKind.OBJECT) return@lazy null
 
-        val field = if (descriptor.isCompanionObject && !CompanionObjectMapping.hasMappingToObject(descriptor)) {
+        val field = if (descriptor.isCompanionObject && !CompanionObjectMapping.isMappedIntrinsicCompanionObject(descriptor)) {
             jClass.enclosingClass.getDeclaredField(descriptor.name.asString())
         }
         else {