azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIR: Fix scope intersection types

Browse Source 
Otherwise overload resolution ambiguity is reported in the test
This commit is contained in:
Denis Zharkov
2020-01-29 17:35:47 +03:00
parent d28e1f156a
commit 47ecaa5b06
24 changed files with 114 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/IncDec.fir.kt
Vendored
+3 -3
View File
@@ -23,9 +23,9 @@ class WrongIncDec() {
fun testWrongIncDec() {
var x = WrongIncDec()
x++
<!AMBIGUITY!>++<!>x
++x
x--
<!AMBIGUITY!>--<!>x
--x
}
class UnitIncDec() {
@@ -43,4 +43,4 @@ fun testUnitIncDec() {
x = x--
x = ++x
x = --x
}
}
compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastAmbiguitites.fir.kt
Vendored
+1 -1
View File
@@ -10,7 +10,7 @@ class C() {
fun test(a : Any?) {
if (a is B) {
if (a is C) {
a.<!AMBIGUITY!>bar<!>();
a.bar();
}
}
}
compiler/testData/diagnostics/tests/generics/nullability/smartCasts.fir.kt
Vendored
+2 -2
View File
@@ -27,8 +27,8 @@ fun <T : CharSequence?> foo(x: T) {
x.length
if (x is String) {
x.<!AMBIGUITY!>length<!>
x?.<!AMBIGUITY!>length<!>
x.length
x?.length
x.bar1()
x.bar2()
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInReturnType.fir.kt
Vendored
+1 -1
View File
@@ -31,6 +31,6 @@ import p.*
fun test(b: B<String>?) {
if (b is C) {
b?.<!AMBIGUITY!>foo<!>()
b?.foo()
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/simpleWithInheritance.fir.kt
Vendored
+1 -1
View File
@@ -33,6 +33,6 @@ import p.*
fun test(b: B?) {
if (b is C && b is D) {
b?.<!AMBIGUITY!>getParent<!>()
b?.getParent()
}
}
compiler/testData/diagnostics/tests/operatorsOverloading/assignmentOperationsCheckReturnType.fir.kt
Vendored
+16 -16
View File
@@ -4,31 +4,31 @@ fun intBinEq() {
x += 1.toByte()
x += 1.toShort()
x += 1L
<!UNRESOLVED_REFERENCE!>x += 1f<!>
<!UNRESOLVED_REFERENCE!>x += 1.0<!>
x += 1f
x += 1.0
<!UNRESOLVED_REFERENCE!>x *= 'a'<!>
<!UNRESOLVED_REFERENCE!>x *= 1.toByte()<!>
<!UNRESOLVED_REFERENCE!>x *= 1.toShort()<!>
<!UNRESOLVED_REFERENCE!>x *= 1L<!>
<!UNRESOLVED_REFERENCE!>x *= 1f<!>
<!UNRESOLVED_REFERENCE!>x *= 1.0<!>
x *= 1.toByte()
x *= 1.toShort()
x *= 1L
x *= 1f
x *= 1.0
}
fun shortBinEq() {
var x = 0.toShort()
<!UNRESOLVED_REFERENCE!>x += 'a'<!>
x += 1.toByte()
<!UNRESOLVED_REFERENCE!>x += 1.toShort()<!>
<!UNRESOLVED_REFERENCE!>x += 1L<!>
<!UNRESOLVED_REFERENCE!>x += 1f<!>
<!UNRESOLVED_REFERENCE!>x += 1.0<!>
x += 1.toShort()
x += 1L
x += 1f
x += 1.0
<!UNRESOLVED_REFERENCE!>x *= 'a'<!>
<!UNRESOLVED_REFERENCE!>x *= 1.toByte()<!>
<!UNRESOLVED_REFERENCE!>x *= 1.toShort()<!>
<!UNRESOLVED_REFERENCE!>x *= 1L<!>
<!UNRESOLVED_REFERENCE!>x *= 1f<!>
<!UNRESOLVED_REFERENCE!>x *= 1.0<!>
x *= 1.toByte()
x *= 1.toShort()
x *= 1L
x *= 1f
x *= 1.0
}
class A {
compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/simple.fir.kt
Vendored
+1 -1
View File
@@ -37,7 +37,7 @@ fun main(
a.foo(it)
// Iterators
a.<!AMBIGUITY!>foo<!>(ml.<!AMBIGUITY!>iterator<!>())
a.foo(ml.iterator())
a.foo(l.iterator())
// Sets
compiler/testData/diagnostics/tests/regressions/kt9682.fir.kt
Vendored
+3 -3
View File
@@ -15,7 +15,7 @@ interface IFoo {
fun test() {
val foo : Foo = Foo2()
foo as IFoo
foo.<!AMBIGUITY!>bar<!>() // Should be resolved to Foo#bar
foo.bar() // Should be resolved to Foo#bar
}
interface IFoo2 {
@@ -24,5 +24,5 @@ interface IFoo2 {
fun test2(foo: Foo) {
foo as IFoo2
foo.<!AMBIGUITY!>bar<!>() // should be ambiguity
}
foo.bar() // should be ambiguity
}
compiler/testData/diagnostics/tests/scopes/stopResolutionOnAmbiguity.fir.kt
Vendored
+1 -1
View File
@@ -12,7 +12,7 @@ class C() {
fun test(a : Any?) {
if (a is B) {
if (a is C) {
a.<!AMBIGUITY!>bar<!>();
a.bar();
}
}
}
compiler/testData/diagnostics/tests/smartCasts/intersectionScope/conflictTypeParameters.fir.kt
Vendored
+1 -1
View File
@@ -8,6 +8,6 @@ interface B {
fun test(c: Any) {
if (c is B && c is A) {
c.<!AMBIGUITY!>foo<!><String, Int>()
c.foo<String, Int>()
}
}
compiler/testData/diagnostics/tests/smartCasts/intersectionScope/conflictingReturnType.fir.kt
Vendored
+1 -1
View File
@@ -10,6 +10,6 @@ interface B {
fun test(c: Any) {
if (c is B && c is A) {
c.<!AMBIGUITY!>foo<!>()
c.foo()
}
}
compiler/testData/diagnostics/tests/smartCasts/intersectionScope/flexibleTypes.fir.kt
Vendored
+14 -14
View File
@@ -17,37 +17,37 @@ interface C {
fun foo(x: Any?) {
if (x is A && x is B) {
x.<!AMBIGUITY!>foo<!>().<!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String>() }
x.<!AMBIGUITY!>foo<!>().<!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String?>() }
x.foo().checkType { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
x.foo().checkType { _<String?>() }
}
if (x is B && x is A) {
x.<!AMBIGUITY!>foo<!>().<!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String>() }
x.<!AMBIGUITY!>foo<!>().<!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String?>() }
x.foo().checkType { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
x.foo().checkType { _<String?>() }
}
if (x is A && x is C) {
x.<!AMBIGUITY!>foo<!>().<!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String>() }
x.<!AMBIGUITY!>foo<!>().<!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String?>() }
x.foo().checkType { _<String>() }
x.foo().checkType { <!INAPPLICABLE_CANDIDATE!>_<!><String?>() }
}
if (x is C && x is A) {
x.<!AMBIGUITY!>foo<!>().<!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String>() }
x.<!AMBIGUITY!>foo<!>().<!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String?>() }
x.foo().checkType { _<String>() }
x.foo().checkType { <!INAPPLICABLE_CANDIDATE!>_<!><String?>() }
}
if (x is A && x is B && x is C) {
x.<!AMBIGUITY!>foo<!>().<!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String>() }
x.<!AMBIGUITY!>foo<!>().<!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String?>() }
x.foo().checkType { _<String>() }
x.foo().checkType { <!INAPPLICABLE_CANDIDATE!>_<!><String?>() }
}
if (x is B && x is A && x is C) {
x.<!AMBIGUITY!>foo<!>().<!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String>() }
x.<!AMBIGUITY!>foo<!>().<!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String?>() }
x.foo().checkType { _<String>() }
x.foo().checkType { <!INAPPLICABLE_CANDIDATE!>_<!><String?>() }
}
if (x is B && x is C && x is A) {
x.<!AMBIGUITY!>foo<!>().<!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String>() }
x.<!AMBIGUITY!>foo<!>().<!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String?>() }
x.foo().checkType { _<String>() }
x.foo().checkType { <!INAPPLICABLE_CANDIDATE!>_<!><String?>() }
}
}
compiler/testData/diagnostics/tests/smartCasts/intersectionScope/mostSpecific.fir.kt
Vendored
+1 -1
View File
@@ -14,6 +14,6 @@ interface B : Common {
fun test(c: Common) {
if (c is B && c is A) {
c.<!AMBIGUITY!>foo<!>().<!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String>() }
c.foo().checkType { _<String>() }
}
}
compiler/testData/diagnostics/tests/smartCasts/intersectionScope/mostSpecificIrrelevant.fir.kt
Vendored
+1 -1
View File
@@ -10,6 +10,6 @@ interface B {
fun test(c: Any) {
if (c is B && c is A) {
c.<!AMBIGUITY!>foo<!>().<!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String>() }
c.foo().checkType { _<String>() }
}
}
compiler/testData/diagnostics/tests/smartCasts/intersectionScope/properties.fir.kt
Vendored
+3 -3
View File
@@ -13,9 +13,9 @@ interface B: A {
fun test(a: A) {
if (a is B && a is C) {
a.<!AMBIGUITY!>foo<!> = ""
a.<!AMBIGUITY!>foo<!> = null
a.foo = ""
a.foo = null
a.<!AMBIGUITY!>foo<!>.<!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String>() }
a.foo.checkType { _<String>() }
}
}
compiler/testData/diagnostics/tests/smartCasts/intersectionScope/propertiesConflict.fir.kt
Vendored
+3 -3
View File
@@ -13,8 +13,8 @@ interface B: A {
fun test(a: A) {
if (a is B && a is C) {
a.<!AMBIGUITY!>foo<!> = ""
a.<!AMBIGUITY!>foo<!> = null
a.<!AMBIGUITY!>foo<!>
a.foo = ""
a.foo = null
a.foo
}
}
compiler/testData/diagnostics/tests/smartCasts/intersectionScope/unstableSmartCast.fir.kt
Vendored
+4 -4
View File
@@ -28,11 +28,11 @@ fun test() {
x.foo().checkType { _<CharSequence?>() }
if (x is B && x is C) {
x.<!AMBIGUITY!>foo<!>().<!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><CharSequence?>() }
x.foo().checkType { <!INAPPLICABLE_CANDIDATE!>_<!><CharSequence?>() }
x.baz("")
x.<!AMBIGUITY!>baz<!>(1).<!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Unit>() }
x.<!AMBIGUITY!>baz<!>(1, 2)
x.baz(1).checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Unit>() }
x.baz(1, 2)
x.<!AMBIGUITY!>foobar<!>().<!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String>() }
x.foobar().checkType { _<String>() }
}
}
compiler/testData/diagnostics/tests/smartCasts/intersectionScope/validTypeParameters.fir.kt
Vendored
+1 -1
View File
@@ -10,6 +10,6 @@ interface B {
fun test(c: Any) {
if (c is B && c is A) {
c.<!AMBIGUITY!>foo<!><String, Int>().<!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
c.foo<String, Int>().checkType { _<Int>() }
}
}