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

FIR checker: differentiate UNSAFE_CALL from INAPPLICABLE_CANDIDATE

Browse Source 
To do so, inside the root cause of inapplicable candidate errors,
we will record expected/actual type of receiver, if any.
That will help identifying inapplicable calls on nullable receiver.
This commit is contained in:
Jinseong Jeon
2021-01-26 16:03:27 -08:00
committed by Mikhail Glukhikh
parent 4b823eca21
commit e72ddbcbfe
275 changed files with 1426 additions and 1388 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/extensionReceiver.fir.kt
Vendored
+2 -2
View File
@@ -17,7 +17,7 @@ fun CharSequence?.isNullOrEmpty(): Boolean {
fun smartcastOnReceiver(s: String?) {
with(s) {
if (isNullOrEmpty()) {
<!INAPPLICABLE_CANDIDATE!>length<!>
<!UNSAFE_CALL!>length<!>
}
else {
length
@@ -32,7 +32,7 @@ fun mixedReceiver(s: String?) {
}
} else {
with(s) {
<!INAPPLICABLE_CANDIDATE!>length<!>
<!UNSAFE_CALL!>length<!>
}
}
}
compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/extensionReceiver_after.fir.kt
Vendored
+2 -2
View File
@@ -17,7 +17,7 @@ fun CharSequence?.isNullOrEmpty(): Boolean {
fun smartcastOnReceiver(s: String?) {
with(s) {
if (isNullOrEmpty()) {
<!INAPPLICABLE_CANDIDATE!>length<!>
<!UNSAFE_CALL!>length<!>
}
else {
length
@@ -32,7 +32,7 @@ fun mixedReceiver(s: String?) {
}
} else {
with(s) {
<!INAPPLICABLE_CANDIDATE!>length<!>
<!UNSAFE_CALL!>length<!>
}
}
}
compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/nullabilitySmartcastWhenNullability.fir.kt
Vendored
+6 -6
View File
@@ -14,7 +14,7 @@ fun nullWhenNull(x: Int?): Int? {
fun testNullWhenNull(x: Int?) {
if (nullWhenNull(x) == null) {
x.<!INAPPLICABLE_CANDIDATE!>dec<!>()
x.<!UNSAFE_CALL!>dec<!>()
}
else {
x.dec()
@@ -24,10 +24,10 @@ fun testNullWhenNull(x: Int?) {
x.dec()
}
else {
x.<!INAPPLICABLE_CANDIDATE!>dec<!>()
x.<!UNSAFE_CALL!>dec<!>()
}
x.<!INAPPLICABLE_CANDIDATE!>dec<!>()
x.<!UNSAFE_CALL!>dec<!>()
}
// NB. it is the same function as `nullWhenNull`, but annotations specifies other facet of the function behaviour
@@ -43,15 +43,15 @@ fun testNotNullWhenNotNull (x: Int?) {
x == null
}
else {
x.<!INAPPLICABLE_CANDIDATE!>dec<!>()
x.<!UNSAFE_CALL!>dec<!>()
}
if (notNullWhenNotNull(x) != null) {
x.<!INAPPLICABLE_CANDIDATE!>dec<!>()
x.<!UNSAFE_CALL!>dec<!>()
}
else {
x == null
}
x.<!INAPPLICABLE_CANDIDATE!>dec<!>()
x.<!UNSAFE_CALL!>dec<!>()
}
compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/operatorsTests/equalsOperator.fir.kt
Vendored
+6 -6
View File
@@ -20,28 +20,28 @@ fun myEqualsNotNull(x: Int?): Boolean {
}
fun testBasicEquals(x: Int?) {
x.<!INAPPLICABLE_CANDIDATE!>inc<!>()
x.<!UNSAFE_CALL!>inc<!>()
if (myEqualsNull(x)) {
x.<!INAPPLICABLE_CANDIDATE!>inc<!>()
x.<!UNSAFE_CALL!>inc<!>()
}
else {
x.inc()
}
x.<!INAPPLICABLE_CANDIDATE!>inc<!>()
x.<!UNSAFE_CALL!>inc<!>()
}
fun testBasicNotEquals(x: Int?) {
x.<!INAPPLICABLE_CANDIDATE!>inc<!>()
x.<!UNSAFE_CALL!>inc<!>()
if (myEqualsNotNull(x)) {
x.inc()
}
else {
x.<!INAPPLICABLE_CANDIDATE!>inc<!>()
x.<!UNSAFE_CALL!>inc<!>()
}
x.<!INAPPLICABLE_CANDIDATE!>inc<!>()
x.<!UNSAFE_CALL!>inc<!>()
}
compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/receiver.fir.kt
Vendored
+3 -3
View File
@@ -14,7 +14,7 @@ fun Any?.isNull(): Boolean {
fun smartcastOnReceiver(x: Int?) {
if (x.isNull()) {
x.<!INAPPLICABLE_CANDIDATE!>inc<!>()
x.<!UNSAFE_CALL!>inc<!>()
}
else {
x.dec()
@@ -26,10 +26,10 @@ class UnstableReceiver {
fun smartcastOnUnstableReceiver() {
if (x.isNull()) {
x.<!INAPPLICABLE_CANDIDATE!>inc<!>()
x.<!UNSAFE_CALL!>inc<!>()
}
else {
x.<!INAPPLICABLE_CANDIDATE!>dec<!>()
x.<!UNSAFE_CALL!>dec<!>()
}
}
}
compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/valueOfContractedFunctionIngored.fir.kt
Vendored
+1 -1
View File
@@ -6,6 +6,6 @@ import kotlin.contracts.*
fun f3(value: String?) {
if (!value.isNullOrEmpty() is Boolean) {
value.<!INAPPLICABLE_CANDIDATE!>length<!>
value.<!UNSAFE_CALL!>length<!>
}
}