Support equalityAxioms in isSubtypeOf()

2014-05-30 23:24:50 +04:00
parent 9cfbfd2806
commit 7f60ccf663
7 changed files with 149 additions and 28 deletions
@@ -0,0 +1,44 @@
+// !DIAGNOSTICS: -UNNECESSARY_SAFE_CALL
+
+// MODULE: m1
+// FILE: a.kt
+package p
+
+public trait Foo<T>
+
+public trait B {
+    public fun <T> foo(a: T): Foo<T>
+}
+
+// MODULE: m2(m1)
+// FILE: b.kt
+package p
+
+public trait C : B {
+    override fun <T> foo(a: T): Foo<T>
+
+}
+
+// MODULE: m3
+// FILE: b.kt
+package p
+
+public trait Foo<T>
+
+public trait B {
+    public fun <T> foo(a: T): Foo<T>
+}
+
+// MODULE: m4(m3, m2)
+// FILE: c.kt
+import p.*
+
+fun test(b: B?) {
+    if (b !is C)  return
+    <!DEBUG_INFO_AUTOCAST!>b<!>?.foo("")
+}
+
+fun test1(b: B?) {
+    if (b !is C)  return
+    <!DEBUG_INFO_AUTOCAST!>b<!>?.foo<String>("")
+}
@@ -0,0 +1,40 @@
+// !DIAGNOSTICS: -UNNECESSARY_SAFE_CALL
+
+// MODULE: m1
+// FILE: a.kt
+package p
+
+public trait B {
+    public fun <T> foo(a: T): T
+}
+
+// MODULE: m2(m1)
+// FILE: b.kt
+package p
+
+public trait C : B {
+    override fun <T> foo(a: T): T
+
+}
+
+// MODULE: m3
+// FILE: b.kt
+package p
+
+public trait B {
+    public fun <T> foo(a: T): T
+}
+
+// MODULE: m4(m3, m2)
+// FILE: c.kt
+import p.*
+
+fun test(b: B?) {
+    if (b !is C)  return
+    <!DEBUG_INFO_AUTOCAST!>b<!>?.foo("")
+}
+
+fun test1(b: B?) {
+    if (b !is C)  return
+    <!DEBUG_INFO_AUTOCAST!>b<!>?.foo<String>("")
+}
@@ -4847,6 +4847,16 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsNotIs.kt");
                }
                
+                @TestMetadata("functionGenericsInParamsReturnFooT.kt")
+                public void testFunctionGenericsInParamsReturnFooT() throws Exception {
+                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnFooT.kt");
+                }
+                
+                @TestMetadata("functionGenericsInParamsReturnT.kt")
+                public void testFunctionGenericsInParamsReturnT() throws Exception {
+                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnT.kt");
+                }
+                
                @TestMetadata("noGenericsInParams.kt")
                public void testNoGenericsInParams() throws Exception {
                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noGenericsInParams.kt");