From bc94ff8ed648bc9bf2f24b7da77eb85b80bffaf6 Mon Sep 17 00:00:00 2001 From: Nikolay Igotti Date: Fri, 20 Dec 2019 18:18:16 +0300 Subject: [PATCH] Fix for uninitialized TLS variables. (#3708) --- .../src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3b1292dddbb..61c2f0d5363 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 @@ -425,7 +425,7 @@ internal class CodeGeneratorVisitor(val context: Context, val lifetimes: Map val expression = irField.initializer?.expression - if (irField.storageKind == FieldStorageKind.THREAD_LOCAL) { + if (irField.initializer != null && irField.storageKind == FieldStorageKind.THREAD_LOCAL) { val initialization = evaluateExpression(irField.initializer!!.expression) val address = context.llvmDeclarations.forStaticField(irField).storageAddressAccess.getAddress( functionGenerationContext