From a3c7dc89196b73ec2a0d5b875879e0a5233baaf5 Mon Sep 17 00:00:00 2001
From: Sergey Bogolepov <ace.is.not.my.card@gmail.com>
Date: Wed, 31 Jan 2018 16:03:29 +0700
Subject: [PATCH] Minor refactoring

---
 .../kotlin/backend/konan/llvm/IrToBitcode.kt        | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

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 8eddecd3056..01a9766c7bc 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
@@ -629,10 +629,6 @@ internal class CodeGeneratorVisitor(val context: Context, val lifetimes: Map<IrE
         }.toMap()
     }
 
-    private fun shouldExportFunction(descriptor: FunctionDescriptor) =
-            descriptor.usedAnnotation
-            || (context.isWasmTarget && descriptor.isExportedForCppRuntime())
-
     override fun visitFunction(declaration: IrFunction) {
         context.log{"visitFunction                  : ${ir2string(declaration)}"}
         val body = declaration.body
@@ -659,14 +655,17 @@ internal class CodeGeneratorVisitor(val context: Context, val lifetimes: Map<IrE
             }
         }
 
+        val descriptor = declaration.descriptor
 
-        if (shouldExportFunction(declaration.descriptor)) {
-            context.llvm.usedFunctions.add(codegen.llvmFunction(declaration.descriptor))
+        // Preserve symbol from deletion if needed
+        if (descriptor.usedAnnotation
+                || (context.isWasmTarget && descriptor.isExportedForCppRuntime())) {
+            context.llvm.usedFunctions += codegen.llvmFunction(descriptor)
         }
 
         if (context.shouldVerifyBitCode())
             verifyModule(context.llvmModule!!,
-                "${declaration.descriptor.containingDeclaration}::${ir2string(declaration)}")
+                "${descriptor.containingDeclaration}::${ir2string(declaration)}")
     }
 
     private fun IrFunction.location(line: Int, column:Int) =