Fix for #1811

JetBrains · Aug 8, 2018 · c716a6e · c716a6e
1 parent 2045951
commit c716a6e
Showing 1 changed file with 3 additions and 1 deletion.
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
@@ -1045,7 +1045,9 @@ 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 irClass = context.ir.get(descriptor)
+        val shared = irClass.symbol.objectIsShared && context.config.threadsAreAllowed
+        val value = getObjectValue(irClass, shared = shared, locationInfo = null, exceptionHandler = ExceptionHandler.Caller)
         ret(kotlinToObjC(value, ReferenceBridge))
     }
 }