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

Remove OI/NI attributes from test data

Browse Source
This commit is contained in:
Denis.Zharkov
2021-05-24 12:42:39 +03:00
committed by teamcityserver
parent 2ecba6ac39
commit ddbdfafa79
441 changed files with 1005 additions and 1037 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/testsWithStdLib/tryCatch/assignTry.kt
Vendored
+2 -2
View File
@@ -11,8 +11,8 @@ fun test2() {
catch (e: ExcA) {
null
}
catch (e: ExcB) <!TYPE_MISMATCH{NI}!>{
<!CONSTANT_EXPECTED_TYPE_MISMATCH{OI}!>10<!>
catch (e: ExcB) <!TYPE_MISMATCH!>{
10
}<!>
s<!UNSAFE_CALL!>.<!>length
}
compiler/testData/diagnostics/testsWithStdLib/tryCatch/falseNegativeSmartcasts_after.kt
Vendored
+1 -1
View File
@@ -13,7 +13,7 @@ fun test1(s1: String?) {
return
}
finally {
<!DEBUG_INFO_SMARTCAST{OI}!>s<!><!UNSAFE_CALL{NI}!>.<!>length
s<!UNSAFE_CALL!>.<!>length
}
<!DEBUG_INFO_SMARTCAST!>s<!>.length
}
compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts_after.kt
Vendored
+12 -12
View File
@@ -13,15 +13,15 @@ fun test1() {
try {
x = null
} catch (e: Exception) {
<!DEBUG_INFO_SMARTCAST{OI}!>x<!><!UNSAFE_CALL{NI}!>.<!>length // smartcast shouldn't be allowed (OOME could happen after `x = null`)
x<!UNSAFE_CALL!>.<!>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
<!DEBUG_INFO_SMARTCAST{OI}!>x<!><!UNSAFE_CALL{NI}!>.<!>length
x<!UNSAFE_CALL!>.<!>length
}
// smartcast shouldn't be allowed, `x = null` could've happened
<!DEBUG_INFO_SMARTCAST{OI}!>x<!><!UNSAFE_CALL{NI}!>.<!>length
x<!UNSAFE_CALL!>.<!>length
}
// With old DFA of try/catch info about unsound smartcasts after try
@@ -34,7 +34,7 @@ fun test2() {
x = null
} catch (e: Exception) {
// BAD
<!DEBUG_INFO_SMARTCAST{OI}!>x<!><!UNSAFE_CALL{NI}!>.<!>length
x<!UNSAFE_CALL!>.<!>length
}
finally {
x<!UNSAFE_CALL!>.<!>length
@@ -50,7 +50,7 @@ fun test3() {
} catch (e: Exception) {
t2 = null
}
<!DEBUG_INFO_SMARTCAST{OI}!>t2<!><!UNSAFE_CALL{NI}!>.<!>not() // wrong smartcast, NPE
t2<!UNSAFE_CALL!>.<!>not() // wrong smartcast, NPE
}
}
@@ -60,7 +60,7 @@ fun test4() {
try {
t2 = null
} finally { }
<!DEBUG_INFO_SMARTCAST{OI}!>t2<!><!UNSAFE_CALL{NI}!>.<!>not() // wrong smartcast, NPE
t2<!UNSAFE_CALL!>.<!>not() // wrong smartcast, NPE
}
}
@@ -80,10 +80,10 @@ fun test5() {
return
}
finally {
<!DEBUG_INFO_SMARTCAST{OI}!>s1<!><!UNSAFE_CALL{NI}!>.<!>length
<!DEBUG_INFO_SMARTCAST{OI}!>s2<!><!UNSAFE_CALL{NI}!>.<!>length
s1<!UNSAFE_CALL!>.<!>length
s2<!UNSAFE_CALL!>.<!>length
}
<!DEBUG_INFO_SMARTCAST{OI}!>s1<!><!UNSAFE_CALL{NI}!>.<!>length
s1<!UNSAFE_CALL!>.<!>length
<!DEBUG_INFO_SMARTCAST!>s2<!>.length
}
@@ -98,10 +98,10 @@ fun test6(s1: String?, s2: String?) {
return
}
finally {
<!DEBUG_INFO_SMARTCAST{OI}!>s<!><!UNSAFE_CALL{NI}!>.<!>length
s<!UNSAFE_CALL!>.<!>length
requireNotNull(s2)
}
<!DEBUG_INFO_SMARTCAST{OI}!>s<!><!UNSAFE_CALL{NI}!>.<!>length
<!DEBUG_INFO_SMARTCAST{NI}!>s1<!><!UNSAFE_CALL{OI}!>.<!>length
s<!UNSAFE_CALL!>.<!>length
<!DEBUG_INFO_SMARTCAST!>s1<!>.length
<!DEBUG_INFO_SMARTCAST!>s2<!>.length
}
compiler/testData/diagnostics/testsWithStdLib/tryCatch/tryExpression.kt
Vendored
+2 -2
View File
@@ -26,9 +26,9 @@ fun test1(): Map<Int, Int> = run {
}
fun test2(): Map<Int, Int> = run {
<!TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>try {
<!TYPE_MISMATCH, TYPE_MISMATCH, TYPE_MISMATCH!>try {
emptyMap()
} catch (e: ExcA) {
<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}!>mapOf(<!TYPE_MISMATCH{NI}!>"" to ""<!>)<!>
<!TYPE_MISMATCH!>mapOf(<!TYPE_MISMATCH!>"" to ""<!>)<!>
}<!>
}