From 9e0c44a323d57153f9f1244fb92df94fcb25f12b Mon Sep 17 00:00:00 2001
From: Igor Chevdar <igor.chevdar@jetbrains.com>
Date: Wed, 18 Apr 2018 18:24:41 +0300
Subject: [PATCH] Fixed bug in vTable building + test

---
 .../org/jetbrains/kotlin/backend/konan/Context.kt |  2 +-
 .../konan/descriptors/ClassVtablesBuilder.kt      |  2 ++
 backend.native/tests/build.gradle                 |  6 ++++++
 .../tests/codegen/bridges/linkTest2_lib.kt        | 15 +++++++++++++++
 .../tests/codegen/bridges/linkTest2_main.kt       |  4 ++++
 5 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 backend.native/tests/codegen/bridges/linkTest2_lib.kt
 create mode 100644 backend.native/tests/codegen/bridges/linkTest2_main.kt

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 03f08b8b102..9e05157a518 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
@@ -89,7 +89,7 @@ internal class SpecialDeclarationsFactory(val context: Context) {
         val irFunction = overriddenFunctionDescriptor.descriptor
         val descriptor = irFunction.descriptor
         assert(overriddenFunctionDescriptor.needBridge,
-                { "Function $descriptor is not needed in a bridge to call overridden function ${overriddenFunctionDescriptor.overriddenDescriptor}" })
+                { "Function $descriptor is not needed in a bridge to call overridden function ${overriddenFunctionDescriptor.overriddenDescriptor.descriptor}" })
         val bridgeDirections = overriddenFunctionDescriptor.bridgeDirections
         return bridgesDescriptors.getOrPut(irFunction to bridgeDirections) {
             val newDescriptor = SimpleFunctionDescriptorImpl.create(
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/ClassVtablesBuilder.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/ClassVtablesBuilder.kt
index c33ed70fa0e..9094607dd5e 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/ClassVtablesBuilder.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/ClassVtablesBuilder.kt
@@ -186,4 +186,6 @@ private val IrClass.sortedOverridableOrOverridingMethods: List<SimpleFunctionDes
     get() =
         this.simpleFunctions()
                 .filter { it.isOverridable || it.overriddenSymbols.isNotEmpty() }
+                // TODO: extract method .isBridge()
+                .filterNot { it.name.asString().contains("<bridge-") }
                 .sortedBy { it.functionName.localHash.value }
diff --git a/backend.native/tests/build.gradle b/backend.native/tests/build.gradle
index e00358af208..706cc81b0bf 100644
--- a/backend.native/tests/build.gradle
+++ b/backend.native/tests/build.gradle
@@ -958,6 +958,12 @@ task bridges_linkTest(type: LinkKonanTest) {
     lib = "codegen/bridges/linkTest_lib.kt"
 }
 
+task bridges_linkTest2(type: LinkKonanTest) {
+    goldValue = "true\n"
+    source = "codegen/bridges/linkTest2_main.kt"
+    lib = "codegen/bridges/linkTest2_lib.kt"
+}
+
 task bridges_special(type: RunKonanTest) {
     goldValue = "Ok\n"
     source = "codegen/bridges/special.kt"
diff --git a/backend.native/tests/codegen/bridges/linkTest2_lib.kt b/backend.native/tests/codegen/bridges/linkTest2_lib.kt
new file mode 100644
index 00000000000..863fc7337d2
--- /dev/null
+++ b/backend.native/tests/codegen/bridges/linkTest2_lib.kt
@@ -0,0 +1,15 @@
+sealed class Tag {
+    abstract fun value(): Any
+}
+
+sealed class TagBoolean : Tag() {
+    abstract override fun value(): Boolean
+
+    object True : TagBoolean() {
+        override fun value() = true
+    }
+
+    object False : TagBoolean() {
+        override fun value() = false
+    }
+}
\ No newline at end of file
diff --git a/backend.native/tests/codegen/bridges/linkTest2_main.kt b/backend.native/tests/codegen/bridges/linkTest2_main.kt
new file mode 100644
index 00000000000..1f95fbf0a9e
--- /dev/null
+++ b/backend.native/tests/codegen/bridges/linkTest2_main.kt
@@ -0,0 +1,4 @@
+fun main(args: Array<String>) {
+    val test: TagBoolean = TagBoolean.True
+    println(test.value())
+}