KT-3500: ClassFormatError: Duplicate method name&signature in class file && KT-3429: Traits override bug

compiler/testData/codegen/box/traits/genericMethod.kt

@@ -0,0 +1,21 @@
+trait A<T> {
+    val property : T
+
+    open  fun a() : T {
+        return property
+    }
+}
+
+open class B : A<Any> {
+
+    override val property: Any = "fail"
+}
+
+open class C : B(), A<Any> {
+
+    override val property: Any = "OK"
+}
+
+fun box() : String {
+    return C().a() as String
+}

compiler/testData/codegen/box/traits/kt3429.kt

@@ -0,0 +1,17 @@
+open class Base {
+    open fun sayHello(): String{
+        return "fail"
+    }
+}
+
+trait Trait: Base {
+    override fun sayHello(): String {
+        return "OK"
+    }
+}
+
+class Derived(): Base(), Trait
+
+fun box() : String {
+    return Derived().sayHello()
+}

compiler/testData/codegen/box/traits/kt3500.kt

@@ -0,0 +1,15 @@
+trait BK {
+    fun foo(): String = 10.toString()
+}
+
+trait KTrait: BK {
+    override fun foo() = 30.toString()
+}
+
+class A : BK, KTrait {
+
+}
+
+fun box(): String {
+    return if (A().foo() == "30") "OK" else "fail"
+}

compiler/testData/codegen/box/traits/withRequiredSuper.kt

@@ -1,16 +1,18 @@
 open class Base {
-    open fun foo() { }
+    open fun foo() : String {
+      return "fail"
+    }
 }
 
 trait Derived : Base {
-    override fun foo() {
-        super.foo()
+    override fun foo() : String {
+        //super.foo()
+        return "OK"
     }
 }
 
 class DerivedImpl : Derived, Base()
 
 fun box(): String {
-    DerivedImpl().foo()
-    return "OK"
+    return DerivedImpl().foo()
 }

compiler/testData/codegen/box/traits/withRequiredSuperViaBridge.kt

@@ -1,12 +1,14 @@
 open class Base {
     open fun foo() { }
+    open fun foo2() { }
 }
 
 trait Derived : Base {
     override fun foo() {
         object {
             fun bar() {
-                super<Base>@Derived.foo()
+                //super<Base>@Derived.foo2()
+                this@Derived.foo2()
             }
         }.bar()
     }