From 3afed720278369858cdadac196c97d294d5d03eb Mon Sep 17 00:00:00 2001 From: Nikolay Lunyak Date: Thu, 11 Jan 2024 15:48:52 +0200 Subject: [PATCH] [FIR] Remove `symbol.fir` from `FirNativeObjCOverrideInitChecker` --- .../kotlin/fir/backend/native/FirNativeOverrideChecker.kt | 4 ++-- .../kotlin/fir/backend/native/interop/FirObjCInterop.kt | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/compiler/fir/native/src/org/jetbrains/kotlin/fir/backend/native/FirNativeOverrideChecker.kt b/compiler/fir/native/src/org/jetbrains/kotlin/fir/backend/native/FirNativeOverrideChecker.kt index df772265198..3e26de06666 100644 --- a/compiler/fir/native/src/org/jetbrains/kotlin/fir/backend/native/FirNativeOverrideChecker.kt +++ b/compiler/fir/native/src/org/jetbrains/kotlin/fir/backend/native/FirNativeOverrideChecker.kt @@ -48,8 +48,8 @@ class FirNativeOverrideChecker(private val session: FirSession) : FirOverrideChe if (this.name != baseDeclaration.name) { return null } - val superInfo = baseDeclaration.decodeObjCMethodAnnotation(session) ?: return null - val subInfo = decodeObjCMethodAnnotation(session) + val superInfo = baseDeclaration.symbol.decodeObjCMethodAnnotation(session) ?: return null + val subInfo = symbol.decodeObjCMethodAnnotation(session) return if (subInfo != null) { // Overriding Objective-C method by Objective-C method in interop stubs. // Don't even check method signatures, so this check is weaker than the standard one diff --git a/compiler/fir/native/src/org/jetbrains/kotlin/fir/backend/native/interop/FirObjCInterop.kt b/compiler/fir/native/src/org/jetbrains/kotlin/fir/backend/native/interop/FirObjCInterop.kt index 9d482ef78a5..18708c055e0 100644 --- a/compiler/fir/native/src/org/jetbrains/kotlin/fir/backend/native/interop/FirObjCInterop.kt +++ b/compiler/fir/native/src/org/jetbrains/kotlin/fir/backend/native/interop/FirObjCInterop.kt @@ -77,9 +77,6 @@ internal fun List.decodeObjCMethodAnnotation(session: FirSession) ) } -internal fun FirFunction.decodeObjCMethodAnnotation(session: FirSession): ObjCMethodInfo? = - annotations.decodeObjCMethodAnnotation(session) - internal fun FirFunctionSymbol<*>.decodeObjCMethodAnnotation(session: FirSession): ObjCMethodInfo? = annotations.decodeObjCMethodAnnotation(session)