azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[K/N][Tests] Move objCActionFqName to NativeStandardInteropNames

Browse Source 
^KT-61259
This commit is contained in:
Vladimir Sukharev
2024-01-02 11:18:32 +01:00
committed by Space Team
parent 28ee61c57d
commit 7eb239c282
6 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InteropLowering.kt
+2 -1
View File
@@ -44,6 +44,7 @@ import org.jetbrains.kotlin.konan.ForeignExceptionMode
import org.jetbrains.kotlin.konan.library.KonanLibrary
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.name.NativeStandardInteropNames.objCActionClassId
import org.jetbrains.kotlin.native.interop.ObjCMethodInfo
internal class InteropLowering(generationState: NativeGenerationState) : FileLoweringPass {
@@ -212,7 +213,7 @@ private class InteropLoweringPart1(val generationState: NativeGenerationState) :
irClass.declarations.toList().mapNotNull {
when {
it is IrSimpleFunction && it.annotations.hasAnnotation(InteropFqNames.objCAction) ->
it is IrSimpleFunction && it.annotations.hasAnnotation(objCActionClassId.asSingleFqName()) ->
generateActionImp(it)
it is IrProperty && it.annotations.hasAnnotation(InteropFqNames.objCOutlet) ->
kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/SpecialBackendChecksTraversal.kt
+3 -2
View File
@@ -33,6 +33,7 @@ import org.jetbrains.kotlin.ir.util.*
import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid
import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.NativeStandardInteropNames.objCActionClassId
import org.jetbrains.kotlin.types.Variance
import org.jetbrains.kotlin.utils.fileUtils.descendantRelativeTo
import java.io.File
@@ -150,7 +151,7 @@ private class BackendChecker(
}
private fun checkCanGenerateActionImp(function: IrSimpleFunction) {
val action = "@${InteropFqNames.objCAction}"
val action = "@${objCActionClassId.asFqNameString()}"
function.extensionReceiverParameter?.let {
reportError(it, "$action method must not have extension receiver")
@@ -207,7 +208,7 @@ private class BackendChecker(
private fun checkKotlinObjCClass(irClass: IrClass) {
for (declaration in irClass.declarations) {
if (declaration is IrSimpleFunction && declaration.annotations.hasAnnotation(InteropFqNames.objCAction))
if (declaration is IrSimpleFunction && declaration.annotations.hasAnnotation(objCActionClassId.asSingleFqName()))
checkCanGenerateActionImp(declaration)
if (declaration is IrProperty && declaration.annotations.hasAnnotation(InteropFqNames.objCOutlet))
checkCanGenerateOutletSetterImp(declaration)