From 49eee47d7e7137df3c7fb52a91e8db6561491e28 Mon Sep 17 00:00:00 2001
From: Svyatoslav Scherbina <svyatoslav.scherbina@jetbrains.com>
Date: Tue, 4 Sep 2018 18:47:06 +0300
Subject: [PATCH] Fix #2004

Fix delegation to constructor of the same class in Objective-C subclasses
---
 .../org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt  | 3 ++-
 backend.native/tests/interop/objc/smoke.kt                  | 6 ++++++
 2 files changed, 8 insertions(+), 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 8b792de340c..82eecae2ac2 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
@@ -2583,7 +2583,8 @@ internal class CodeGeneratorVisitor(val context: Context, val lifetimes: Map<IrE
         val constructedClass = functionGenerationContext.constructedClass!!
         val thisPtr = currentCodeContext.genGetValue(constructedClass.thisReceiver!!)
 
-        if (constructedClass.isObjCClass()) {
+        if (descriptor.constructedClass.isExternalObjCClass()) {
+            assert(args.isEmpty())
             return codegen.theUnitInstanceRef.llvm
         }
 
diff --git a/backend.native/tests/interop/objc/smoke.kt b/backend.native/tests/interop/objc/smoke.kt
index 88f36c5098a..5bddbfa14a7 100644
--- a/backend.native/tests/interop/objc/smoke.kt
+++ b/backend.native/tests/interop/objc/smoke.kt
@@ -45,6 +45,10 @@ fun run() {
     pair.swap()
     println("${pair.first}, ${pair.second}")
 
+    val defaultPair = MutablePairImpl()
+    assertEquals(defaultPair.first(), 123)
+    assertEquals(defaultPair.second(), 321)
+
     // equals and hashCode (virtually):
     val map = mapOf(foo to pair, pair to foo)
 
@@ -105,6 +109,8 @@ class MutablePairImpl(first: Int, second: Int) : NSObject(), MutablePairProtocol
     override fun update(index: Int, sub: Int) {
         elements[index] -= sub
     }
+
+    constructor() : this(123, 321)
 }
 
 fun testTypeOps() {