From 18887f8bec29d8134dabb0ea0b2133e5f2870aea Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Mon, 15 Aug 2016 19:40:38 +0300
Subject: [PATCH] Rename CompanionObjectMapping.hasMappingToObject ->
 isMappedIntrinsicCompanionObject

---
 .../backend/src/org/jetbrains/kotlin/codegen/FieldInfo.java     | 2 +-
 .../src/org/jetbrains/kotlin/load/java/JvmAbi.java              | 2 +-
 .../src/org/jetbrains/kotlin/builtins/CompanionObjectMapping.kt | 2 +-
 .../src/kotlin/reflect/jvm/internal/KClassImpl.kt               | 2 +-
 .../kotlin/js/translate/intrinsic/objects/objectsIntrinsics.kt  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/FieldInfo.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FieldInfo.java
index ceca18c9c11..363f313d07f 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/FieldInfo.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FieldInfo.java
@@ -33,7 +33,7 @@ public class FieldInfo {
             throw new UnsupportedOperationException("Can't create singleton field for class: " + classDescriptor);
         }
 
-        if (isNonCompanionObject(classDescriptor) || CompanionObjectMapping.INSTANCE.hasMappingToObject(classDescriptor)) {
+        if (isNonCompanionObject(classDescriptor) || CompanionObjectMapping.INSTANCE.isMappedIntrinsicCompanionObject(classDescriptor)) {
             return createSingletonViaInstance(classDescriptor, typeMapper);
         }
 
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAbi.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAbi.java
index 99944cfcb82..50220fe334f 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAbi.java
+++ b/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);
     }
 }
diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/CompanionObjectMapping.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/CompanionObjectMapping.kt
index eeaf4e36a47..c5b28e5e1ec 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/builtins/CompanionObjectMapping.kt
+++ b/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
diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt
index de30d5054ad..52c7d193094 100644
--- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt
+++ b/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 {
diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/objects/objectsIntrinsics.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/objects/objectsIntrinsics.kt
index 97f8ff994b8..d19d74e21b7 100644
--- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/objects/objectsIntrinsics.kt
+++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/objects/objectsIntrinsics.kt
@@ -34,7 +34,7 @@ class DefaultClassObjectIntrinsic(val fqName: FqName): ObjectIntrinsic {
 
 class ObjectIntrinsics {
     fun getIntrinsic(classDescriptor: ClassDescriptor): ObjectIntrinsic {
-        if (!CompanionObjectMapping.hasMappingToObject(classDescriptor)) return NO_OBJECT_INTRINSIC
+        if (!CompanionObjectMapping.isMappedIntrinsicCompanionObject(classDescriptor)) return NO_OBJECT_INTRINSIC
 
         val containingDeclaration = classDescriptor.containingDeclaration
         val name = Name.identifier(containingDeclaration.name.asString() + "CompanionObject")