Do not report CONFLICTING_JVM_DECLARATIONS on delegated origin element

This commit is contained in:
Nikolay Krasko
2015-02-24 21:33:55 +03:00
parent c6f8a1cfcc
commit 377209f0c3
9 changed files with 37 additions and 19 deletions
+1 -1
View File
@@ -14,7 +14,7 @@ ERROR: compiler/testData/cli/jvm/signatureClash.kt: (12, 1) Platform declaration
ERROR: compiler/testData/cli/jvm/signatureClash.kt: (13, 1) Platform declaration clash: The following declarations have the same JVM signature (getB()I):
fun <get-b>(): kotlin.Int
fun getB(): kotlin.Int
ERROR: compiler/testData/cli/jvm/signatureClash.kt: (16, 5) Platform declaration clash: The following declarations have the same JVM signature (getTr()I):
ERROR: compiler/testData/cli/jvm/signatureClash.kt: (19, 7) Platform declaration clash: The following declarations have the same JVM signature (getTr()I):
fun <get-tr>(): kotlin.Int
fun getTr(): kotlin.Int
ERROR: compiler/testData/cli/jvm/signatureClash.kt: (20, 5) Platform declaration clash: The following declarations have the same JVM signature (getTr()I):
@@ -2,6 +2,6 @@ trait B {
fun getX() = 1
}
class C : B {
class <!CONFLICTING_JVM_DECLARATIONS!>C<!> : B {
<!NOTHING_TO_OVERRIDE!>override<!> val x = 1
}
@@ -2,7 +2,7 @@ trait T {
fun getX() = 1
}
class C : T {
class <!CONFLICTING_JVM_DECLARATIONS!>C<!> : T {
val x: Int
<!CONFLICTING_JVM_DECLARATIONS!>get()<!> = 1
}
@@ -3,6 +3,6 @@ trait T {
get() = 1
}
class C : T {
class <!CONFLICTING_JVM_DECLARATIONS!>C<!> : T {
<!CONFLICTING_JVM_DECLARATIONS!>fun getX()<!> = 1
}
@@ -8,6 +8,6 @@ trait Bar<T> {
fun foo(l: List<T>) {}
}
class Baz(): Foo<String>, Bar<Int> {
class <!CONFLICTING_JVM_DECLARATIONS!>Baz()<!>: Foo<String>, Bar<Int> {
<!CONFLICTING_JVM_DECLARATIONS!>fun foo(l: List<Long>)<!> {}
}
@@ -2,6 +2,6 @@ trait T {
fun getX() = 1
}
class C : T {
class <!CONFLICTING_JVM_DECLARATIONS!>C<!> : T {
<!CONFLICTING_JVM_DECLARATIONS!>val x<!> = 1
}