Fix for #1811

JetBrains · Aug 8, 2018 · 9f04c03 · 9f04c03
1 parent 7a9ba7f
commit 9f04c03
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/...e/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt b/...e/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt
@@ -673,7 +673,6 @@ internal class FunctionGenerationContext(val function: LLVMValueRef,
 
     fun getObjectValue(
             descriptor: ClassDescriptor,
-            shared: Boolean,
             exceptionHandler: ExceptionHandler,
             locationInfo: LocationInfo?
     ): LLVMValueRef {
@@ -695,6 +694,7 @@ internal class FunctionGenerationContext(val function: LLVMValueRef,
             }
         }
 
+        val shared = descriptor.symbol.objectIsShared && context.config.threadsAreAllowed
         val objectPtr = codegen.getObjectInstanceStorage(descriptor, shared)
         val bbCurrent = currentBlock
         val bbInit= basicBlock("label_init", locationInfo)

diff --git a/...ive/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt b/...ive/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt
@@ -815,7 +815,6 @@ internal class CodeGeneratorVisitor(val context: Context, val lifetimes: Map<IrE
     private fun evaluateGetObjectValue(value: IrGetObjectValue): LLVMValueRef =
             functionGenerationContext.getObjectValue(
                     value.symbol.owner,
-                    value.symbol.objectIsShared && context.config.threadsAreAllowed,
                     currentCodeContext.exceptionHandler,
                     value.startLocation
             )

diff --git a/....native/src/org/jetbrains/kotlin/backend/konan/llvm/objcexport/ObjCExportCodeGenerator.kt b/....native/src/org/jetbrains/kotlin/backend/konan/llvm/objcexport/ObjCExportCodeGenerator.kt
@@ -1044,8 +1044,7 @@ private fun ObjCExportCodeGenerator.createObjectInstanceAdapter(
 
     return generateObjCToKotlinSyntheticGetter(selector) {
         initRuntimeIfNeeded() // For instance methods it gets called when allocating.
-
-        val value = getObjectValue(context.ir.get(descriptor), shared = false, locationInfo = null, exceptionHandler = ExceptionHandler.Caller)
+        val value = getObjectValue(context.ir.get(descriptor), locationInfo = null, exceptionHandler = ExceptionHandler.Caller)
         ret(kotlinToObjC(value, ReferenceBridge))
     }
 }