JVM_IR: remove descriptor usage from JvmCachedDeclarations

This commit is contained in:
Georgy Bronnikov
2020-09-07 20:29:46 +03:00
parent 92b03e7ede
commit 905978a458
2 changed files with 10 additions and 2 deletions
@@ -6,8 +6,12 @@
package org.jetbrains.kotlin.builtins
import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.resolve.DescriptorUtils
import org.jetbrains.kotlin.resolve.descriptorUtil.classId
fun CompanionObjectMapping.isMappedIntrinsicCompanionObject(classDescriptor: ClassDescriptor): Boolean =
DescriptorUtils.isCompanionObject(classDescriptor) && classDescriptor.classId?.outerClassId in classIds
fun CompanionObjectMapping.isMappedIntrinsicCompanionObjectClassId(classId: ClassId): Boolean =
classId.outerClassId in classIds