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

Add selector to ObjCGetterForKotlinEnumEntry

Browse Source 
This helps to drop usages of obsolete "IrDeclaration.descriptor"
from ObjCExportCodeGenerator
This commit is contained in:
Svyatoslav Scherbina
2021-01-28 15:29:50 +03:00
committed by Vasily Levchenko
parent ca2df3cead
commit ccf8b570ca
2 changed files with 8 additions and 6 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/llvm/objcexport/ObjCExportCodeGenerator.kt
+3 -4
View File
@@ -1252,7 +1252,7 @@ private fun ObjCExportCodeGenerator.createTypeAdapter(
classAdapters += createArrayConstructorAdapter(it.irConstructorSymbol.owner) classAdapters += createArrayConstructorAdapter(it.irConstructorSymbol.owner)
} }
is ObjCGetterForKotlinEnumEntry -> { is ObjCGetterForKotlinEnumEntry -> {
classAdapters += createEnumEntryAdapter(it.irEnumEntrySymbol.owner) classAdapters += createEnumEntryAdapter(it.irEnumEntrySymbol.owner, it.selector)
} }
is ObjCClassMethodForKotlinEnumValues -> { is ObjCClassMethodForKotlinEnumValues -> {
classAdapters += createEnumValuesAdapter(it.valuesFunctionSymbol.owner, it.selector) classAdapters += createEnumValuesAdapter(it.valuesFunctionSymbol.owner, it.selector)
@@ -1480,10 +1480,9 @@ private fun ObjCExportCodeGenerator.createObjectInstanceAdapter(
} }
private fun ObjCExportCodeGenerator.createEnumEntryAdapter( private fun ObjCExportCodeGenerator.createEnumEntryAdapter(
irEnumEntry: IrEnumEntry irEnumEntry: IrEnumEntry,
selector: String
): ObjCExportCodeGenerator.ObjCToKotlinMethodAdapter { ): ObjCExportCodeGenerator.ObjCToKotlinMethodAdapter {
val selector = namer.getEnumEntrySelector(irEnumEntry.descriptor)
return generateObjCToKotlinSyntheticGetter(selector) { return generateObjCToKotlinSyntheticGetter(selector) {
initRuntimeIfNeeded() // For instance methods it gets called when allocating. initRuntimeIfNeeded() // For instance methods it gets called when allocating.
kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportCodeSpec.kt
+5 -2
View File
@@ -69,7 +69,7 @@ internal fun ObjCExportedInterface.createCodeSpec(symbolTable: SymbolTable): Obj
if (descriptor.kind == ClassKind.ENUM_CLASS) { if (descriptor.kind == ClassKind.ENUM_CLASS) {
descriptor.enumEntries.mapTo(methods) { descriptor.enumEntries.mapTo(methods) {
ObjCGetterForKotlinEnumEntry(symbolTable.referenceEnumEntry(it)) ObjCGetterForKotlinEnumEntry(symbolTable.referenceEnumEntry(it), namer.getEnumEntrySelector(it))
} }
descriptor.getEnumValuesFunctionDescriptor()?.let { descriptor.getEnumValuesFunctionDescriptor()?.let {
@@ -109,7 +109,10 @@ internal class ObjCFactoryMethodForKotlinArrayConstructor(
val irConstructorSymbol: IrConstructorSymbol val irConstructorSymbol: IrConstructorSymbol
) : ObjCMethodSpec() ) : ObjCMethodSpec()
internal class ObjCGetterForKotlinEnumEntry(val irEnumEntrySymbol: IrEnumEntrySymbol) : ObjCMethodSpec() internal class ObjCGetterForKotlinEnumEntry(
val irEnumEntrySymbol: IrEnumEntrySymbol,
val selector: String
) : ObjCMethodSpec()
internal class ObjCClassMethodForKotlinEnumValues( internal class ObjCClassMethodForKotlinEnumValues(
val valuesFunctionSymbol: IrFunctionSymbol, val valuesFunctionSymbol: IrFunctionSymbol,