From b2fe9ffab0726b504a23e19f210e09590af3a701 Mon Sep 17 00:00:00 2001
From: Sergey Bogolepov <ace.is.not.my.card@gmail.com>
Date: Mon, 5 Feb 2018 11:24:50 +0300
Subject: [PATCH] Rolled back changes to IrToBitcode

Rolled back changes to BinaryInterface

Rolled back changes to Context
---
 .../src/org/jetbrains/kotlin/backend/konan/Context.kt      | 1 -
 .../jetbrains/kotlin/backend/konan/llvm/BinaryInterface.kt | 3 ---
 .../org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt | 7 +++----
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Context.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Context.kt
index 498e6d094e5..cd6a8f60d15 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Context.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Context.kt
@@ -45,7 +45,6 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid
 import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid
 import org.jetbrains.kotlin.ir.visitors.acceptVoid
 import org.jetbrains.kotlin.konan.target.CompilerOutputKind
-import org.jetbrains.kotlin.konan.target.KonanTarget
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi2ir.generators.GeneratorContext
 import org.jetbrains.kotlin.resolve.DescriptorUtils
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/BinaryInterface.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/BinaryInterface.kt
index 05b1ab9b74c..7f53f40357c 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/BinaryInterface.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/BinaryInterface.kt
@@ -270,6 +270,3 @@ internal val ClassDescriptor.objectInstanceFieldSymbolName: String
 
 internal val ClassDescriptor.typeInfoHasVtableAttached: Boolean
     get() = !this.isAbstract() && !this.isExternalObjCClass()
-
-internal fun FunctionDescriptor.isExportedForCppRuntime() =
-        annotations.hasAnnotation(exportForCppRuntimeAnnotation)
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt
index 274b1b40a91..f3e8a699291 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt
@@ -655,15 +655,14 @@ internal class CodeGeneratorVisitor(val context: Context, val lifetimes: Map<IrE
             }
         }
 
-        val descriptor = declaration.descriptor
 
-        if (descriptor.usedAnnotation) {
-            context.llvm.usedFunctions += codegen.llvmFunction(descriptor)
+        if (declaration.descriptor.usedAnnotation) {
+            context.llvm.usedFunctions.add(codegen.llvmFunction(declaration.descriptor))
         }
 
         if (context.shouldVerifyBitCode())
             verifyModule(context.llvmModule!!,
-                "${descriptor.containingDeclaration}::${ir2string(declaration)}")
+                "${declaration.descriptor.containingDeclaration}::${ir2string(declaration)}")
     }
 
     private fun IrFunction.location(line: Int, column:Int) =