[Native] Move more utils functions to :native:base

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

Hide file tree

Showing 2 changed files with 43 additions and 37 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
@@ -9,50 +9,15 @@ import org.jetbrains.kotlin.backend.konan.DECLARATION_ORIGIN_INLINE_CLASS_SPECIA
 import org.jetbrains.kotlin.backend.konan.llvm.KonanMetadata
 import org.jetbrains.kotlin.backend.konan.serialization.isFromCInteropLibrary
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
-import org.jetbrains.kotlin.ir.IrBuiltIns
 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.impl.IrConstImpl
-import org.jetbrains.kotlin.ir.expressions.impl.IrConstructorCallImpl
-import org.jetbrains.kotlin.ir.expressions.impl.fromSymbolOwner
-import org.jetbrains.kotlin.ir.types.IdSignatureValues
-import org.jetbrains.kotlin.ir.types.isMarkedNullable
-import org.jetbrains.kotlin.ir.util.*
+import org.jetbrains.kotlin.ir.util.target
 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
 
-fun IrClass.isUnit() = this.isClassTypeWithSignature(IdSignatureValues.unit)
-
-fun IrClass.isKotlinArray() = this.isClassTypeWithSignature(IdSignatureValues.array)
-
-fun IrClass.isNothing() = this.isClassTypeWithSignature(IdSignatureValues.nothing)
-
-fun IrClass.getSuperInterfaces() = this.superClasses.map { it.owner }.filter { it.isInterface }
-
-fun IrClass.isSpecialClassWithNoSupertypes() = this.isAny() || this.isNothing()
-
-fun IrValueParameter.isInlineParameter(): Boolean =
-    !this.isNoinline && (this.type.isFunction() || this.type.isSuspendFunction()) && !this.type.isMarkedNullable()
-
-fun buildSimpleAnnotation(irBuiltIns: IrBuiltIns, startOffset: Int, endOffset: Int,
-                          annotationClass: IrClass, vararg args: String): IrConstructorCall {
-    val constructor = annotationClass.constructors.let {
-        it.singleOrNull() ?: it.single { ctor -> ctor.valueParameters.size == args.size }
-    }
-    return IrConstructorCallImpl.fromSymbolOwner(startOffset, endOffset, constructor.returnType, constructor.symbol).apply {
-        args.forEachIndexed { index, arg ->
-            assert(constructor.valueParameters[index].type == irBuiltIns.stringType) {
-                "String type expected but was ${constructor.valueParameters[index].type}"
-            }
-            putValueArgument(index, IrConstImpl.string(startOffset, endOffset, irBuiltIns.stringType, arg))
-        }
-    }
-}
-
 internal fun IrExpression.isBoxOrUnboxCall() =
         (this is IrCall && symbol.owner.origin == DECLARATION_ORIGIN_INLINE_CLASS_SPECIAL_FUNCTION)
 

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
@@ -5,20 +5,61 @@
 
 package org.jetbrains.kotlin.backend.konan.ir
 
+import org.jetbrains.kotlin.ir.IrBuiltIns
 import org.jetbrains.kotlin.ir.declarations.IrClass
+import org.jetbrains.kotlin.ir.declarations.IrValueParameter
+import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
+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.symbols.UnsafeDuringIrConstructionAPI
 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.IdSignature
+import org.jetbrains.kotlin.ir.util.constructors
+import org.jetbrains.kotlin.ir.util.isFunction
 import org.jetbrains.kotlin.ir.util.isInterface
+import org.jetbrains.kotlin.ir.util.isSuspendFunction
 import org.jetbrains.kotlin.utils.atMostOne
 
-fun IrClass.isClassTypeWithSignature(signature: IdSignature.CommonSignature): Boolean {
+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 }
 @OptIn(UnsafeDuringIrConstructionAPI::class)
 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)
+
+@OptIn(UnsafeDuringIrConstructionAPI::class)
+fun IrClass.getSuperInterfaces() = this.superClasses.map { it.owner }.filter { it.isInterface }
+
+fun IrClass.isSpecialClassWithNoSupertypes() = this.isAny() || this.isNothing()
+
+fun IrValueParameter.isInlineParameter(): Boolean =
+    !this.isNoinline && (this.type.isFunction() || this.type.isSuspendFunction()) && !this.type.isMarkedNullable()
+
+@OptIn(UnsafeDuringIrConstructionAPI::class)
+fun buildSimpleAnnotation(irBuiltIns: IrBuiltIns, startOffset: Int, endOffset: Int,
+                          annotationClass: IrClass, vararg args: String): IrConstructorCall {
+    val constructor = annotationClass.constructors.let {
+        it.singleOrNull() ?: it.single { ctor -> ctor.valueParameters.size == args.size }
+    }
+    return IrConstructorCallImpl.fromSymbolOwner(startOffset, endOffset, constructor.returnType, constructor.symbol).apply {
+        args.forEachIndexed { index, arg ->
+            assert(constructor.valueParameters[index].type == irBuiltIns.stringType) {
+                "String type expected but was ${constructor.valueParameters[index].type}"
+            }
+            putValueArgument(index, IrConstImpl.string(startOffset, endOffset, irBuiltIns.stringType, arg))
+        }
+    }
+}