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

[FIR] Implement new bound smartcast algorithm

Browse Source 
#KT-36055 Fixed
This commit is contained in:
Dmitriy Novozhilov
2020-02-10 17:14:58 +03:00
parent 40f907ec2f
commit 6735cc8937
103 changed files with 2197 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts.fir.kt
Vendored
+3 -3
View File
@@ -15,7 +15,7 @@ fun test1(s: String?) {
catch (e: Exception) {
requireNotNull(s)
}
t2.<!UNRESOLVED_REFERENCE!>not<!>()
t2.<!INAPPLICABLE_CANDIDATE!>not<!>()
s.length
}
}
@@ -45,7 +45,7 @@ fun test3() {
s = null
return
}
s.<!UNRESOLVED_REFERENCE!>length<!>
s.<!INAPPLICABLE_CANDIDATE!>length<!>
}
fun test4() {
@@ -61,7 +61,7 @@ fun test4() {
catch (e: ExcB) {
}
s.<!UNRESOLVED_REFERENCE!>length<!>
s.<!INAPPLICABLE_CANDIDATE!>length<!>
}
fun test5(s: String?) {
compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts_after.fir.kt
Vendored
+3 -3
View File
@@ -16,7 +16,7 @@ fun test1(s: String?) {
catch (e: Exception) {
requireNotNull(s)
}
t2.<!UNRESOLVED_REFERENCE!>not<!>()
t2.<!INAPPLICABLE_CANDIDATE!>not<!>()
s.length
}
}
@@ -46,7 +46,7 @@ fun test3() {
s = null
return
}
s.<!UNRESOLVED_REFERENCE!>length<!>
s.<!INAPPLICABLE_CANDIDATE!>length<!>
}
fun test4() {
@@ -62,7 +62,7 @@ fun test4() {
catch (e: ExcB) {
}
s.<!UNRESOLVED_REFERENCE!>length<!>
s.<!INAPPLICABLE_CANDIDATE!>length<!>
}
fun test5(s: String?) {
compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts.fir.kt
Vendored
+12 -12
View File
@@ -13,15 +13,15 @@ fun test1() {
try {
x = null
} catch (e: Exception) {
x.<!UNRESOLVED_REFERENCE!>length<!> // smartcast shouldn't be allowed (OOME could happen after `x = null`)
x.<!INAPPLICABLE_CANDIDATE!>length<!> // smartcast shouldn't be allowed (OOME could happen after `x = null`)
throw e
}
finally {
// smartcast shouldn't be allowed, `x = null` could've happened
x.<!UNRESOLVED_REFERENCE!>length<!>
x.<!INAPPLICABLE_CANDIDATE!>length<!>
}
// smartcast shouldn't be allowed, `x = null` could've happened
x.<!UNRESOLVED_REFERENCE!>length<!>
x.<!INAPPLICABLE_CANDIDATE!>length<!>
}
// With old DFA of try/catch info about unsound smartcasts after try
@@ -33,12 +33,12 @@ fun test2() {
try {
x = null
} catch (e: Exception) {
x.<!UNRESOLVED_REFERENCE!>length<!>
x.<!INAPPLICABLE_CANDIDATE!>length<!>
}
finally {
x.<!UNRESOLVED_REFERENCE!>length<!>
x.<!INAPPLICABLE_CANDIDATE!>length<!>
}
x.<!UNRESOLVED_REFERENCE!>length<!>
x.<!INAPPLICABLE_CANDIDATE!>length<!>
}
fun test3() {
@@ -49,7 +49,7 @@ fun test3() {
} catch (e: Exception) {
t2 = null
}
t2.<!UNRESOLVED_REFERENCE!>not<!>() // wrong smartcast, NPE
t2.<!INAPPLICABLE_CANDIDATE!>not<!>() // wrong smartcast, NPE
}
}
@@ -59,7 +59,7 @@ fun test4() {
try {
t2 = null
} finally { }
t2.<!UNRESOLVED_REFERENCE!>not<!>() // wrong smartcast, NPE
t2.<!INAPPLICABLE_CANDIDATE!>not<!>() // wrong smartcast, NPE
}
}
@@ -80,10 +80,10 @@ fun test5() {
}
finally {
s1.length
s2.<!UNRESOLVED_REFERENCE!>length<!>
s2.<!INAPPLICABLE_CANDIDATE!>length<!>
}
s1.length
s2.<!UNRESOLVED_REFERENCE!>length<!>
s2.<!INAPPLICABLE_CANDIDATE!>length<!>
}
fun test6(s1: String?, s2: String?) {
@@ -97,10 +97,10 @@ fun test6(s1: String?, s2: String?) {
return
}
finally {
s.<!UNRESOLVED_REFERENCE!>length<!>
s.<!INAPPLICABLE_CANDIDATE!>length<!>
requireNotNull(s2)
}
s.<!UNRESOLVED_REFERENCE!>length<!>
s.<!INAPPLICABLE_CANDIDATE!>length<!>
s1.length
s2.length
}
compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts_after.fir.kt
Vendored
+12 -12
View File
@@ -14,15 +14,15 @@ fun test1() {
try {
x = null
} catch (e: Exception) {
x.<!UNRESOLVED_REFERENCE!>length<!> // smartcast shouldn't be allowed (OOME could happen after `x = null`)
x.<!INAPPLICABLE_CANDIDATE!>length<!> // smartcast shouldn't be allowed (OOME could happen after `x = null`)
throw e
}
finally {
// smartcast shouldn't be allowed, `x = null` could've happened
x.<!UNRESOLVED_REFERENCE!>length<!>
x.<!INAPPLICABLE_CANDIDATE!>length<!>
}
// smartcast shouldn't be allowed, `x = null` could've happened
x.<!UNRESOLVED_REFERENCE!>length<!>
x.<!INAPPLICABLE_CANDIDATE!>length<!>
}
// With old DFA of try/catch info about unsound smartcasts after try
@@ -35,12 +35,12 @@ fun test2() {
x = null
} catch (e: Exception) {
// BAD
x.<!UNRESOLVED_REFERENCE!>length<!>
x.<!INAPPLICABLE_CANDIDATE!>length<!>
}
finally {
x.<!UNRESOLVED_REFERENCE!>length<!>
x.<!INAPPLICABLE_CANDIDATE!>length<!>
}
x.<!UNRESOLVED_REFERENCE!>length<!>
x.<!INAPPLICABLE_CANDIDATE!>length<!>
}
fun test3() {
@@ -51,7 +51,7 @@ fun test3() {
} catch (e: Exception) {
t2 = null
}
t2.<!UNRESOLVED_REFERENCE!>not<!>() // wrong smartcast, NPE
t2.<!INAPPLICABLE_CANDIDATE!>not<!>() // wrong smartcast, NPE
}
}
@@ -61,7 +61,7 @@ fun test4() {
try {
t2 = null
} finally { }
t2.<!UNRESOLVED_REFERENCE!>not<!>() // wrong smartcast, NPE
t2.<!INAPPLICABLE_CANDIDATE!>not<!>() // wrong smartcast, NPE
}
}
@@ -82,10 +82,10 @@ fun test5() {
}
finally {
s1.length
s2.<!UNRESOLVED_REFERENCE!>length<!>
s2.<!INAPPLICABLE_CANDIDATE!>length<!>
}
s1.length
s2.<!UNRESOLVED_REFERENCE!>length<!>
s2.<!INAPPLICABLE_CANDIDATE!>length<!>
}
fun test6(s1: String?, s2: String?) {
@@ -99,10 +99,10 @@ fun test6(s1: String?, s2: String?) {
return
}
finally {
s.<!UNRESOLVED_REFERENCE!>length<!>
s.<!INAPPLICABLE_CANDIDATE!>length<!>
requireNotNull(s2)
}
s.<!UNRESOLVED_REFERENCE!>length<!>
s.<!INAPPLICABLE_CANDIDATE!>length<!>
s1.length
s2.length
}