From 29748e59df76f43ecf06faebb0a99b72adc354c5 Mon Sep 17 00:00:00 2001
From: Svyatoslav Scherbina <svyatoslav.scherbina@jetbrains.com>
Date: Wed, 12 Sep 2018 18:22:35 +0300
Subject: [PATCH] Don't add swift_name attribute to categories in framework

---
 .../konan/objcexport/ObjCExportHeaderGenerator.kt     | 11 +++++------
 1 file changed, 5 insertions(+), 6 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 6ec4dfd67eb..c8f7eb8b5f2 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
@@ -112,7 +112,6 @@ abstract class ObjCExportHeaderGenerator(
             descriptor: ClassDescriptor? = null,
             superClass: String? = null,
             superProtocols: List<String> = emptyList(),
-            categoryName: String? = null,
             members: List<Stub<*>> = emptyList(),
             attributes: List<String> = emptyList()
     ): ObjCInterface = ObjCInterface(
@@ -121,7 +120,7 @@ abstract class ObjCExportHeaderGenerator(
             descriptor,
             superClass,
             superProtocols,
-            categoryName,
+            null,
             members,
             attributes + name.toNameAttributes()
     )
@@ -156,8 +155,8 @@ abstract class ObjCExportHeaderGenerator(
         }))
 
         // TODO: add comment to the header.
-        stubs.add(objCInterface(
-                kotlinAnyName,
+        stubs.add(ObjCInterface(
+                kotlinAnyName.objCName,
                 superProtocols = listOf("NSCopying"),
                 categoryName = "${kotlinAnyName.objCName}Copying"
         ))
@@ -333,11 +332,11 @@ abstract class ObjCExportHeaderGenerator(
     private fun translateExtensions(classDescriptor: ClassDescriptor, declarations: List<CallableMemberDescriptor>) {
         translateClass(classDescriptor)
 
-        val name = translateClassName(classDescriptor)
+        val name = translateClassName(classDescriptor).objCName
         val members = buildMembers {
             translateMembers(declarations)
         }
-        stubs.add(objCInterface(name, categoryName = "Extensions", members = members))
+        stubs.add(ObjCInterface(name, categoryName = "Extensions", members = members))
     }
 
     private fun translateTopLevel(sourceFile: SourceFile, declarations: List<CallableMemberDescriptor>) {