[FIR] Fix data-flow after while loops

This commit is contained in:
simon.ogorodnik
2020-01-31 15:20:19 +03:00
committed by Mikhail Glukhikh
parent 91b432b4a1
commit 645602b675
15 changed files with 34 additions and 19 deletions
+3 -3
View File
@@ -38,7 +38,7 @@ class C {
break;
}
}
a.<!INAPPLICABLE_CANDIDATE!>compareTo<!>("2")
a.compareTo("2")
}
fun containsBreakWithLabel(a: String?) {
@@ -52,7 +52,7 @@ class C {
loop@ while(a == null) {
break@label
}
a.<!INAPPLICABLE_CANDIDATE!>compareTo<!>("2")
a.compareTo("2")
}
fun containsBreakToOuterLoop(a: String?, b: String?) {
@@ -60,7 +60,7 @@ class C {
while(a == null) {
break@loop
}
a.<!INAPPLICABLE_CANDIDATE!>compareTo<!>("2")
a.compareTo("2")
}
}
+2 -2
View File
@@ -151,7 +151,7 @@ fun test() {
out2?.println();
out2.<!INAPPLICABLE_CANDIDATE!>println<!>();
}
out2.<!INAPPLICABLE_CANDIDATE!>println<!>()
out2.println()
}
@@ -228,7 +228,7 @@ fun f6(s : String?) {
do {
s?.get(0)
} while (s == null)
s.<!INAPPLICABLE_CANDIDATE!>get<!>(0)
s.get(0)
}
fun f7(s : String?, t : String?) {
@@ -127,12 +127,12 @@ fun f13(a : A?) {
fun f14(a : A?) {
while (!(a is B)) {
}
a.<!UNRESOLVED_REFERENCE!>bar<!>()
a.bar()
}
fun f15(a : A?) {
do {
} while (!(a is B))
a.<!UNRESOLVED_REFERENCE!>bar<!>()
a.bar()
}
fun getStringLength(obj : Any) : Char? {
@@ -1,5 +1,5 @@
fun foo(s: String?): Int {
do {
} while (s==null)
return s.<!INAPPLICABLE_CANDIDATE!>length<!>
return s.length
}
@@ -7,7 +7,7 @@ public fun foo(p: String?, r: String?): Int {
} while (r == null)
} while (!x())
// Auto cast possible
r.<!INAPPLICABLE_CANDIDATE!>length<!>
r.length
// Auto cast possible
return p.length
}
@@ -8,7 +8,7 @@ public fun foo(p: String?, r: String?): Int {
} while (r == null)
} while (!x())
// Auto cast NOT possible due to long continue
r.<!INAPPLICABLE_CANDIDATE!>length<!>
r.length
// Auto cast possible
return p.length
}
@@ -11,7 +11,7 @@ public fun foo(p: String?, r: String?, q: String?): Int {
if (!x()) break
}
// Smart cast is possible everywhere
r.<!INAPPLICABLE_CANDIDATE!>length<!>
r.length
q.length
return p.length
}
@@ -9,7 +9,7 @@ public fun foo(p: String?, r: String?, q: String?): Int {
if (!x()) break
}
// Smart cast is possible everywhere
r.<!INAPPLICABLE_CANDIDATE!>length<!>
r.length
q.length
return p.length
}
@@ -12,7 +12,7 @@ public fun foo(p: String?, r: String?, q: String?): Int {
if (!x()) break
}
// Smart cast is possible everywhere
r.<!INAPPLICABLE_CANDIDATE!>length<!>
r.length
q.length
return p.length
}
@@ -14,6 +14,6 @@ public fun foo(p: String?, r: String?, q: String?): Int {
// Smart cast is possible only for q
q.length
// But not possible for the others
r.<!INAPPLICABLE_CANDIDATE!>length<!>
r.length
return p.length
}
@@ -1,5 +1,5 @@
fun foo(s: String?): Int {
while (s==null) {
}
return s.<!INAPPLICABLE_CANDIDATE!>length<!>
return s.length
}
@@ -5,5 +5,5 @@ fun main() {
if (i == 10) result = "non null"
else i++
}
result.<!INAPPLICABLE_CANDIDATE!>length<!>
result.length
}
@@ -11,5 +11,5 @@ public fun foo(xx: Any): Int {
// y!! in both branches
y.length
} while (!(x is String))
return x.<!UNRESOLVED_REFERENCE!>length<!>
return x.length
}
@@ -9,7 +9,7 @@ public fun foo(pp: String?, rr: String?): Int {
} while (r == null)
} while (!x())
// Auto cast possible
r.<!INAPPLICABLE_CANDIDATE!>length<!>
r.length
// Auto cast possible
return p.length
}