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

Relax rules about inferring to Nothing for special calls

Browse Source 
#KT-37388 Fixed
 #KT-38427 Fixed
 #KT-39953 Fixed
 #KT-38899 Fixed
This commit is contained in:
Mikhail Zarechenskiy
2020-07-15 10:59:10 +03:00
parent e45cd02b01
commit 100a6f70ca
55 changed files with 424 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/64.kt
Vendored
+2 -2
View File
@@ -84,7 +84,7 @@ class Case5<T> {
fun get(): T {
var x = getTN()
x = if (x == null) getT() else <!DEBUG_INFO_SMARTCAST!>x<!>
x = if (x == null) getT() else x
<!DEBUG_INFO_EXPRESSION_TYPE("T & T?")!>x<!>
return <!DEBUG_INFO_SMARTCAST!>x<!>
}
@@ -97,7 +97,7 @@ class Case6 {
fun get(): Int {
var x = getIntN()
x = if (x == null) getInt() else <!DEBUG_INFO_SMARTCAST!>x<!>
x = if (x == null) getInt() else x
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x<!>
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?"), DEBUG_INFO_SMARTCAST!>x<!>.equals(10)
return <!DEBUG_INFO_SMARTCAST!>x<!>