[IR] Replaced K/N findPackage with common getPackageFragment

compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/Ir.kt

@@ -250,7 +250,7 @@ abstract class Symbols<out T : CommonBackendContext>(
             symbol is IrSimpleFunctionSymbol && symbol.owner.let { function ->
                 function.name.asString() == "<get-isInitialized>" &&
                         function.isTopLevel &&
-                        function.getPackageFragment()!!.fqName.asString() == "kotlin" &&
+                        function.getPackageFragment().fqName.asString() == "kotlin" &&
                         function.valueParameters.isEmpty() &&
                         symbol.owner.extensionReceiverParameter?.type?.classOrNull?.owner.let { receiverClass ->
                             receiverClass?.fqNameWhenAvailable?.toUnsafe() == StandardNames.FqNames.kProperty0

compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt

@@ -582,7 +582,7 @@ class ExpressionCodegen(
             // Copy-pasted bytecode blocks are not suspension points.
             symbol.owner.isInline ->
                 if (symbol.owner.name.asString() == "suspendCoroutineUninterceptedOrReturn" &&
-                    symbol.owner.getPackageFragment()?.fqName == FqName("kotlin.coroutines.intrinsics")
+                    symbol.owner.getPackageFragment().fqName == FqName("kotlin.coroutines.intrinsics")
                 )
                     SuspensionPointKind.ALWAYS
                 else

compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/AssertionLowering.kt

@@ -119,5 +119,5 @@ private class AssertionLowering(private val context: JvmBackendContext) :
     }
 
     private val IrFunction.isAssert: Boolean
-        get() = name.asString() == "assert" && getPackageFragment()?.fqName == StandardNames.BUILT_INS_PACKAGE_FQ_NAME
+        get() = name.asString() == "assert" && getPackageFragment().fqName == StandardNames.BUILT_INS_PACKAGE_FQ_NAME
 }

compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/PropertyReferenceDelegationLowering.kt

@@ -85,7 +85,7 @@ private class PropertyReferenceDelegationTransformer(val context: JvmBackendCont
         }
 
     private val IrStatement.isStdlibCall: Boolean
-        get() = this is IrCall && symbol.owner.getPackageFragment()?.fqName == StandardNames.BUILT_INS_PACKAGE_FQ_NAME
+        get() = this is IrCall && symbol.owner.getPackageFragment().fqName == StandardNames.BUILT_INS_PACKAGE_FQ_NAME
 
     // Some receivers don't need to be stored in fields and can be reevaluated every time an accessor is called:
     private fun IrExpression.canInline(visibleScopes: Set<IrDeclarationParent>): Boolean = when (this) {

compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/SyntheticAccessorLowering.kt

@@ -89,7 +89,7 @@ internal class SyntheticAccessorLowering(val context: JvmBackendContext) : FileL
 
             val ownerClass = declaration.parent as? IrClass ?: return true // locals are always accessible
             val scopeClassOrPackage = inlineScopeResolver.findContainer(currentScope!!.irElement) ?: return false
-            val samePackage = ownerClass.getPackageFragment()?.fqName == scopeClassOrPackage.getPackageFragment()?.fqName
+            val samePackage = ownerClass.getPackageFragment().fqName == scopeClassOrPackage.getPackageFragment()?.fqName
             return when {
                 jvmVisibility == 0 /* package only */ -> samePackage
                 jvmVisibility == Opcodes.ACC_PRIVATE -> ownerClass == scopeClassOrPackage

compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/VarargLowering.kt

@@ -101,7 +101,7 @@ internal const val ARRAY_OF_NAME = "arrayOf"
 
 internal fun IrFunction.isArrayOf(): Boolean {
     val parent = when (val directParent = parent) {
-        is IrClass -> directParent.getPackageFragment() ?: return false
+        is IrClass -> directParent.getPackageFragment()
         is IrPackageFragment -> directParent
         else -> return false
     }

compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/ir/IrInlineReferenceLocator.kt

@@ -65,8 +65,8 @@ class IrInlineScopeResolver(context: JvmBackendContext) : IrInlineReferenceLocat
         get() = isInline && DescriptorVisibilities.isPrivate(visibility)
 
     private fun IrFunction.isCoroutineIntrinsic(): Boolean =
-        (name.asString() == "suspendCoroutine" && getPackageFragment()?.fqName == FqName("kotlin.coroutines")) ||
+        (name.asString() == "suspendCoroutine" && getPackageFragment().fqName == FqName("kotlin.coroutines")) ||
-                (name.asString() == "suspendCoroutineUninterceptedOrReturn" && getPackageFragment()?.fqName == FqName("kotlin.coroutines.intrinsics"))
+                (name.asString() == "suspendCoroutineUninterceptedOrReturn" && getPackageFragment().fqName == FqName("kotlin.coroutines.intrinsics"))
 
     fun findContainer(scope: IrElement): IrDeclarationContainer? =
         findContainer(scope, approximateToPackage = false)

compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/mapping/MethodSignatureMapper.kt

@@ -452,7 +452,7 @@ class MethodSignatureMapper(private val context: JvmBackendContext) {
     }
 
     private val IrSimpleFunction.isBuiltIn: Boolean
-        get() = getPackageFragment()?.fqName == StandardNames.BUILT_INS_PACKAGE_FQ_NAME ||
+        get() = getPackageFragment().fqName == StandardNames.BUILT_INS_PACKAGE_FQ_NAME ||
                 parent.safeAs<IrClass>()?.fqNameWhenAvailable?.toUnsafe()?.let(JavaToKotlinClassMap::mapKotlinToJava) != null
 
     // From BuiltinMethodsWithDifferentJvmName.isBuiltinFunctionWithDifferentNameInJvm, BuiltinMethodsWithDifferentJvmName.getJvmName

compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/metadata/DescriptorMetadataSerializer.kt

@@ -63,7 +63,7 @@ class DescriptorMetadataSerializer(
             is DescriptorMetadataSource.Class -> serializer!!.classProto(metadata.descriptor).build()
             is DescriptorMetadataSource.Script -> serializer!!.classProto(metadata.descriptor).build()
             is DescriptorMetadataSource.File ->
-                serializer!!.packagePartProto(irClass.getPackageFragment()!!.fqName, metadata.descriptors).apply {
+                serializer!!.packagePartProto(irClass.getPackageFragment().fqName, metadata.descriptors).apply {
                     serializerExtension.serializeJvmPackage(this, type)
                 }.build()
             is DescriptorMetadataSource.Function -> {

compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmCompiledModuleFragment.kt

@@ -95,7 +95,6 @@ class WasmCompiledModuleFragment(val irBuiltIns: IrBuiltIns) {
             val declaration = (ir as? IrSymbol)?.owner as? IrDeclarationWithName
             if (declaration != null) {
                 val packageFragment = declaration.getPackageFragment()
-                    ?: error("Referencing declaration without package fragment ${declaration.fqNameWhenAvailable}")
                 if (packageFragment is IrExternalPackageFragment) {
                     error("Referencing declaration without package fragment ${declaration.fqNameWhenAvailable}")
                 }

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IrUtils.kt

@@ -273,12 +273,13 @@ val IrDeclaration.parentAsClass: IrClass
     get() = parent as? IrClass
         ?: error("Parent of this declaration is not a class: ${render()}")
 
-tailrec fun IrElement.getPackageFragment(): IrPackageFragment? {
+fun IrElement.getPackageFragment(): IrPackageFragment? =
-    if (this is IrPackageFragment) return this
+    this as? IrPackageFragment ?: (this as? IrDeclaration)?.getPackageFragment()
-    return when (val parent = (this as? IrDeclaration)?.parent) {
+
-        is IrPackageFragment -> parent
+tailrec fun IrDeclaration.getPackageFragment(): IrPackageFragment {
-        else -> parent?.getPackageFragment()
+    val parent = this.parent
-    }
+    return parent as? IrPackageFragment
+        ?: (parent as IrDeclaration).getPackageFragment()
 }
 
 fun IrConstructorCall.isAnnotation(name: FqName) = symbol.owner.parentAsClass.fqNameWhenAvailable == name
@@ -484,12 +485,7 @@ fun IrMemberAccessExpression<IrFunctionSymbol>.copyValueArgumentsFrom(
 }
 
 val IrDeclaration.fileOrNull: IrFile?
-    get() = when (val parent = parent) {
+    get() = getPackageFragment() as? IrFile
-        is IrFile -> parent
-        is IrPackageFragment -> null
-        is IrDeclaration -> parent.fileOrNull
-        else -> TODO("Unexpected declaration parent")
-    }
 
 val IrDeclaration.file: IrFile
     get() = fileOrNull ?: TODO("Unknown file")

kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanBackendContext.kt

@@ -9,7 +9,6 @@ import org.jetbrains.kotlin.backend.common.CommonBackendContext
 import org.jetbrains.kotlin.backend.common.DefaultMapping
 import org.jetbrains.kotlin.backend.common.Mapping
 import org.jetbrains.kotlin.backend.konan.descriptors.KonanSharedVariablesManager
-import org.jetbrains.kotlin.backend.konan.descriptors.findPackage
 import org.jetbrains.kotlin.backend.konan.ir.KonanIr
 import org.jetbrains.kotlin.builtins.konan.KonanBuiltIns
 import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
@@ -22,6 +21,7 @@ import org.jetbrains.kotlin.ir.declarations.IrDeclaration
 import org.jetbrains.kotlin.ir.declarations.IrFactory
 import org.jetbrains.kotlin.ir.declarations.IrFile
 import org.jetbrains.kotlin.ir.declarations.impl.IrFactoryImpl
+import org.jetbrains.kotlin.ir.util.getPackageFragment
 
 internal abstract class KonanBackendContext(val config: KonanConfig) : CommonBackendContext {
     abstract override val builtIns: KonanBuiltIns
@@ -59,7 +59,7 @@ internal fun IrElement.getCompilerMessageLocation(containingFile: IrFile): Compi
 
 internal fun IrBuilderWithScope.getCompilerMessageLocation(): CompilerMessageLocation? {
     val declaration = this.scope.scopeOwnerSymbol.owner as? IrDeclaration ?: return null
-    val file = declaration.findPackage() as? IrFile ?: return null
+    val file = declaration.getPackageFragment() as? IrFile ?: return null
     return createCompilerMessageLocation(file, startOffset, endOffset)
 }
 

kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/ClassLayoutBuilder.kt

@@ -472,7 +472,7 @@ internal class ClassLayoutBuilder(val irClass: IrClass, val context: Context) {
             context.specialDeclarationsFactory.getOuterThisField(irClass)
         else null
         if (context.config.lazyIrForCaches && !context.llvmModuleSpecification.containsDeclaration(irClass)) {
-            val packageFragment = irClass.findPackage()
+            val packageFragment = irClass.getPackageFragment()
             val moduleDescriptor = packageFragment.packageFragmentDescriptor.containingDeclaration
             if (moduleDescriptor.isFromInteropLibrary())
                 return emptyList()

kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/DescriptorUtils.kt

@@ -236,12 +236,6 @@ internal fun IrSimpleFunction.bridgeDirectionsTo(overriddenFunction: IrSimpleFun
     return ourDirections
 }
 
-internal tailrec fun IrDeclaration.findPackage(): IrPackageFragment {
-    val parent = this.parent
-    return parent as? IrPackageFragment
-            ?: (parent as IrDeclaration).findPackage()
-}
-
 fun IrFunctionSymbol.isComparisonFunction(map: Map<IrClassifierSymbol, IrSimpleFunctionSymbol>): Boolean =
         this in map.values
 

kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/FakeIrUtils.kt

@@ -6,16 +6,16 @@
 package org.jetbrains.kotlin.backend.konan.ir
 
 import org.jetbrains.kotlin.backend.konan.*
-import org.jetbrains.kotlin.backend.konan.descriptors.findPackage
 import org.jetbrains.kotlin.backend.konan.llvm.llvmSymbolOrigin
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.types.IrType
 import org.jetbrains.kotlin.ir.types.toKotlinType
+import org.jetbrains.kotlin.ir.util.getPackageFragment
 
 // This file contains some IR utilities which actually use descriptors.
 // TODO: port this code to IR.
 
-internal val IrDeclaration.llvmSymbolOrigin get() = findPackage().packageFragmentDescriptor.llvmSymbolOrigin
+internal val IrDeclaration.llvmSymbolOrigin get() = getPackageFragment().packageFragmentDescriptor.llvmSymbolOrigin
 
 internal fun IrType.isObjCObjectType() = this.toKotlinType().isObjCObjectType()
 

kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/RTTIGenerator.kt

@@ -564,7 +564,7 @@ internal class RTTIGenerator(override val context: Context) : ContextUtils {
     }
 
     private fun getReflectionInfo(irClass: IrClass): ReflectionInfo {
-        val packageName: String = irClass.findPackage().fqName.asString() // Compute and store package name in TypeInfo anyways.
+        val packageName: String = irClass.getPackageFragment().fqName.asString() // Compute and store package name in TypeInfo anyways.
         val relativeName: String?
         val flags: Int
 

kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeInlineFunctionResolver.kt

@@ -13,13 +13,14 @@ import org.jetbrains.kotlin.backend.common.lower.inline.LocalClassesInInlineFunc
 import org.jetbrains.kotlin.backend.common.lower.inline.LocalClassesInInlineLambdasLowering
 import org.jetbrains.kotlin.backend.konan.Context
 import org.jetbrains.kotlin.backend.konan.InlineFunctionOriginInfo
-import org.jetbrains.kotlin.backend.konan.descriptors.findPackage
 import org.jetbrains.kotlin.ir.declarations.IrExternalPackageFragment
+import org.jetbrains.kotlin.ir.declarations.IrFile
 import org.jetbrains.kotlin.ir.declarations.IrFunction
 import org.jetbrains.kotlin.ir.symbols.IrFunctionSymbol
 import org.jetbrains.kotlin.ir.util.dump
 import org.jetbrains.kotlin.ir.util.file
 import org.jetbrains.kotlin.ir.util.render
+import org.jetbrains.kotlin.ir.util.getPackageFragment
 
 // TODO: This is a bit hacky. Think about adopting persistent IR ideas.
 internal class NativeInlineFunctionResolver(override val context: Context) : DefaultInlineFunctionResolver(context) {
@@ -28,11 +29,11 @@ internal class NativeInlineFunctionResolver(override val context: Context) : Def
 
         context.specialDeclarationsFactory.loweredInlineFunctions[function]?.let { return it.irFunction }
 
-        val packageFragment = function.findPackage()
+        val packageFragment = function.getPackageFragment()
         val notLoweredFunction = if (packageFragment !is IrExternalPackageFragment) {
             context.specialDeclarationsFactory.getNonLoweredInlineFunction(function).also {
                 context.specialDeclarationsFactory.loweredInlineFunctions[function] =
-                        InlineFunctionOriginInfo(it, function.file, function.startOffset, function.endOffset)
+                        InlineFunctionOriginInfo(it, packageFragment as IrFile, function.startOffset, function.endOffset)
             }
         } else {
             // The function is from Lazy IR, get its body from the IR linker.

kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrlinker.kt

@@ -714,7 +714,7 @@ internal class KonanIrLinker(
         private val inlineFunctionFiles = mutableMapOf<IrExternalPackageFragment, IrFile>()
 
         fun deserializeInlineFunction(function: IrFunction): InlineFunctionOriginInfo {
-            val packageFragment = function.findPackage() as? IrExternalPackageFragment
+            val packageFragment = function.getPackageFragment() as? IrExternalPackageFragment
                     ?: error("Expected an external package fragment for ${function.render()}")
             if (function.parents.any { (it as? IrFunction)?.isInline == true}) {
                 // Already deserialized by the top-most inline function.