From 7fca0a821652f1b128e63d6d61274e6214146aae Mon Sep 17 00:00:00 2001 From: Vyacheslav Karpukhin Date: Fri, 17 Apr 2020 18:54:25 +0200 Subject: [PATCH] Descriptors for synthetic enum value stubs --- .../backend/konan/objcexport/ObjCExportHeaderGenerator.kt | 2 +- .../org/jetbrains/kotlin/backend/konan/objcexport/stubs.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportHeaderGenerator.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportHeaderGenerator.kt index 0134b7ffb11..f4fa2a9e5fd 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportHeaderGenerator.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportHeaderGenerator.kt @@ -365,7 +365,7 @@ internal class ObjCExportTranslatorImpl( descriptor.enumEntries.forEach { val entryName = namer.getEnumEntrySelector(it) - +ObjCProperty(entryName, null, type, listOf("class", "readonly"), + +ObjCProperty(entryName, it, type, listOf("class", "readonly"), declarationAttributes = listOf(swiftNameAttribute(entryName))) } } diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/stubs.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/stubs.kt index fec222d5bb6..6e1d2564f64 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/stubs.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/stubs.kt @@ -68,12 +68,12 @@ class ObjCParameter(name: String, val type: ObjCType) : Stub(name) class ObjCProperty(name: String, - override val descriptor: PropertyDescriptor?, + override val descriptor: DeclarationDescriptorWithSource?, val type: ObjCType, val propertyAttributes: List, val setterName: String? = null, val getterName: String? = null, - val declarationAttributes: List = emptyList()) : Stub(name) { + val declarationAttributes: List = emptyList()) : Stub(name) { @Deprecated("", ReplaceWith("this.propertyAttributes"), DeprecationLevel.WARNING) val attributes: List get() = propertyAttributes