From cff142a617a39dfb74406e9cd5cc04fa422379b1 Mon Sep 17 00:00:00 2001
From: Sergey Bogolepov <ace.is.not.my.card@gmail.com>
Date: Wed, 31 Jan 2018 17:09:51 +0700
Subject: [PATCH] Review fixes

---
 .../src/org/jetbrains/kotlin/backend/konan/Context.kt        | 5 ++---
 .../org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt   | 2 +-
 .../org/jetbrains/kotlin/backend/konan/llvm/RTTIGenerator.kt | 2 +-
 3 files changed, 4 insertions(+), 5 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 642a59a76da..070180b32c0 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
@@ -386,8 +386,7 @@ internal class Context(config: KonanConfig) : KonanBackendContext(config) {
         config.configuration.get(KonanConfigKeys.PRODUCE) == CompilerOutputKind.DYNAMIC
     }
 
-    val isWasmTarget: Boolean by lazy {
-        config.targetManager.target == KonanTarget.WASM32
-    }
+    fun shouldPreserveRuntimeSymbols(): Boolean =
+            config.targetManager.target == KonanTarget.WASM32
 }
 
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 01a9766c7bc..3bb027165a7 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
@@ -659,7 +659,7 @@ internal class CodeGeneratorVisitor(val context: Context, val lifetimes: Map<IrE
 
         // Preserve symbol from deletion if needed
         if (descriptor.usedAnnotation
-                || (context.isWasmTarget && descriptor.isExportedForCppRuntime())) {
+                || (context.shouldPreserveRuntimeSymbols() && descriptor.isExportedForCppRuntime())) {
             context.llvm.usedFunctions += codegen.llvmFunction(descriptor)
         }
 
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/RTTIGenerator.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/RTTIGenerator.kt
index 32ff435f248..4adf3a13af5 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/RTTIGenerator.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/RTTIGenerator.kt
@@ -90,7 +90,7 @@ internal class RTTIGenerator(override val context: Context) : ContextUtils {
             // TODO: use LLVMAddAlias?
             val global = addGlobal(nameValue.value, pointerType(runtime.typeInfoType), isExported = true)
 
-            if (context.isWasmTarget) {
+            if (context.shouldPreserveRuntimeSymbols()) {
                 context.llvm.usedGlobals += global
             }