[Native] Move IrTypeInlineClassesSupport to :native:base

^KT-73869 Fixed
JetBrains · Jan 8, 2025 · c4cb017 · c4cb017
1 parent ff7805f
commit c4cb017
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 13 deletions.
diff --git a/...native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/NewIrUtils.kt b/...native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/NewIrUtils.kt
@@ -14,33 +14,21 @@ import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.expressions.IrCall
 import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 import org.jetbrains.kotlin.ir.expressions.IrExpression
-import org.jetbrains.kotlin.ir.expressions.IrFunctionAccessExpression
 import org.jetbrains.kotlin.ir.expressions.impl.IrConstImpl
 import org.jetbrains.kotlin.ir.expressions.impl.IrConstructorCallImpl
 import org.jetbrains.kotlin.ir.expressions.impl.fromSymbolOwner
-import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
 import org.jetbrains.kotlin.ir.types.IdSignatureValues
-import org.jetbrains.kotlin.ir.types.classifierOrFail
 import org.jetbrains.kotlin.ir.types.isMarkedNullable
 import org.jetbrains.kotlin.ir.util.*
 import org.jetbrains.kotlin.library.KotlinLibrary
 import org.jetbrains.kotlin.library.metadata.DeserializedKlibModuleOrigin
 import org.jetbrains.kotlin.library.metadata.klibModuleOrigin
 import org.jetbrains.kotlin.utils.atMostOne
 
-private fun IrClass.isClassTypeWithSignature(signature: IdSignature.CommonSignature): Boolean {
-    return signature == symbol.signature
-}
-
 fun IrClass.isUnit() = this.isClassTypeWithSignature(IdSignatureValues.unit)
 
 fun IrClass.isKotlinArray() = this.isClassTypeWithSignature(IdSignatureValues.array)
 
-val IrClass.superClasses get() = this.superTypes.map { it.classifierOrFail as IrClassSymbol }
-fun IrClass.getSuperClassNotAny() = this.superClasses.map { it.owner }.atMostOne { !it.isInterface && !it.isAny() }
-
-fun IrClass.isAny() = this.isClassTypeWithSignature(IdSignatureValues.any)
-
 fun IrClass.isNothing() = this.isClassTypeWithSignature(IdSignatureValues.nothing)
 
 fun IrClass.getSuperInterfaces() = this.superClasses.map { it.owner }.filter { it.isInterface }

diff --git a/...ckend/konan/IrTypeInlineClassesSupport.kt → ...ckend/konan/IrTypeInlineClassesSupport.kt b/...ckend/konan/IrTypeInlineClassesSupport.kt → ...ckend/konan/IrTypeInlineClassesSupport.kt
@@ -14,6 +14,7 @@ import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
 import org.jetbrains.kotlin.ir.symbols.IrClassifierSymbol
 import org.jetbrains.kotlin.ir.symbols.IrScriptSymbol
 import org.jetbrains.kotlin.ir.symbols.IrTypeParameterSymbol
+import org.jetbrains.kotlin.ir.symbols.UnsafeDuringIrConstructionAPI
 import org.jetbrains.kotlin.ir.types.IrType
 import org.jetbrains.kotlin.ir.types.classifierOrFail
 import org.jetbrains.kotlin.ir.types.makeNullable
@@ -41,12 +42,13 @@ fun IrClass.isUsedAsBoxClass(): Boolean = IrTypeInlineClassesSupport.isUsedAsBox
 
 fun IrType.binaryTypeIsReference(): Boolean = this.computePrimitiveBinaryTypeOrNull() == null
 
-internal inline fun <R> IrType.unwrapToPrimitiveOrReference(
+inline fun <R> IrType.unwrapToPrimitiveOrReference(
         eachInlinedClass: (inlinedClass: IrClass, nullable: Boolean) -> Unit,
         ifPrimitive: (primitiveType: KonanPrimitiveType, nullable: Boolean) -> R,
         ifReference: (type: IrType) -> R
 ): R = IrTypeInlineClassesSupport.unwrapToPrimitiveOrReference(this, eachInlinedClass, ifPrimitive, ifReference)
 
+@OptIn(UnsafeDuringIrConstructionAPI::class)
 internal object IrTypeInlineClassesSupport : InlineClassesSupport<IrClass, IrType>() {
 
     override fun isNullable(type: IrType): Boolean = type.isNullable()

diff --git a/native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/ir/Utils.kt b/native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/ir/Utils.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2010-2024 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.backend.konan.ir
+
+import org.jetbrains.kotlin.ir.declarations.IrClass
+import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
+import org.jetbrains.kotlin.ir.symbols.UnsafeDuringIrConstructionAPI
+import org.jetbrains.kotlin.ir.types.IdSignatureValues
+import org.jetbrains.kotlin.ir.types.classifierOrFail
+import org.jetbrains.kotlin.ir.util.IdSignature
+import org.jetbrains.kotlin.ir.util.isInterface
+import org.jetbrains.kotlin.utils.atMostOne
+
+fun IrClass.isClassTypeWithSignature(signature: IdSignature.CommonSignature): Boolean {
+    return signature == symbol.signature
+}
+val IrClass.superClasses get() = this.superTypes.map { it.classifierOrFail as IrClassSymbol }
+@OptIn(UnsafeDuringIrConstructionAPI::class)
+fun IrClass.getSuperClassNotAny() = this.superClasses.map { it.owner }.atMostOne { !it.isInterface && !it.isAny() }
+
+fun IrClass.isAny() = this.isClassTypeWithSignature(IdSignatureValues.any)