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

[FIR] Don't assume types with not found symbol as error types

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-09-10 15:47:02 +03:00
parent 7f692be11e
commit 1dc3c93efa
59 changed files with 330 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/intersectingInfo.fir.kt
Vendored
+6 -6
View File
@@ -31,12 +31,12 @@ fun intersectingInfo(x: Any?, y: Any?) {
if ((isString(x) && y is String) || (!notIsString(x) && !notIsInt(y))) {
x.length
y.<!UNRESOLVED_REFERENCE!>length<!>
y.<!AMBIGUITY!>inc<!>()
y.<!UNRESOLVED_REFERENCE!>inc<!>()
}
else {
x.<!UNRESOLVED_REFERENCE!>length<!>
y.<!UNRESOLVED_REFERENCE!>length<!>
y.<!AMBIGUITY!>inc<!>()
y.<!UNRESOLVED_REFERENCE!>inc<!>()
}
}
@@ -49,13 +49,13 @@ fun intersectingInfo2(x: Any?, y: Any?) {
(!notIsString(x) && isString(y) && y is Int) ||
(x is String && !notIsInt(y) && x is Int)) {
x.length
x.<!AMBIGUITY!>inc<!>()
x.<!UNRESOLVED_REFERENCE!>inc<!>()
y.<!UNRESOLVED_REFERENCE!>length<!>
y.<!AMBIGUITY!>inc<!>()
y.<!UNRESOLVED_REFERENCE!>inc<!>()
}
x.<!UNRESOLVED_REFERENCE!>length<!>
x.<!AMBIGUITY!>inc<!>()
x.<!UNRESOLVED_REFERENCE!>inc<!>()
y.<!UNRESOLVED_REFERENCE!>length<!>
y.<!AMBIGUITY!>inc<!>()
y.<!UNRESOLVED_REFERENCE!>inc<!>()
}
compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/intersectionTypes.fir.kt
Vendored
+3 -3
View File
@@ -28,7 +28,7 @@ fun testDeMorgan(x: Any?) {
}
else {
x.<!UNRESOLVED_REFERENCE!>length<!>
x.<!AMBIGUITY!>inc<!>()
x.<!UNRESOLVED_REFERENCE!>inc<!>()
}
}
@@ -36,10 +36,10 @@ fun testDeMorgan2(x: Any?) {
// x !is String || x !is Int
if (notIsString(x) || notIsInt(x)) {
x.<!UNRESOLVED_REFERENCE!>length<!>
x.<!AMBIGUITY!>inc<!>()
x.<!UNRESOLVED_REFERENCE!>inc<!>()
}
else {
x.length
x.inc()
}
}
}
compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/nullabilitySmartcastWhenNullability.fir.kt
Vendored
+7 -7
View File
@@ -14,7 +14,7 @@ fun nullWhenNull(x: Int?): Int? {
fun testNullWhenNull(x: Int?) {
if (nullWhenNull(x) == null) {
x.<!AMBIGUITY!>dec<!>()
x.<!INAPPLICABLE_CANDIDATE!>dec<!>()
}
else {
x.dec()
@@ -24,10 +24,10 @@ fun testNullWhenNull(x: Int?) {
x.dec()
}
else {
x.<!AMBIGUITY!>dec<!>()
x.<!INAPPLICABLE_CANDIDATE!>dec<!>()
}
x.<!AMBIGUITY!>dec<!>()
x.<!INAPPLICABLE_CANDIDATE!>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.<!AMBIGUITY!>dec<!>()
x.<!INAPPLICABLE_CANDIDATE!>dec<!>()
}
if (notNullWhenNotNull(x) != null) {
x.<!AMBIGUITY!>dec<!>()
x.<!INAPPLICABLE_CANDIDATE!>dec<!>()
}
else {
x == null
}
x.<!AMBIGUITY!>dec<!>()
}
x.<!INAPPLICABLE_CANDIDATE!>dec<!>()
}
compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/operatorsTests/andOperator.fir.kt
Vendored
+7 -7
View File
@@ -42,17 +42,17 @@ fun truetrue(x: Any?) {
x.inc()
}
x.<!UNRESOLVED_REFERENCE!>length<!>
x.<!AMBIGUITY!>inc<!>()
x.<!UNRESOLVED_REFERENCE!>inc<!>()
}
fun truefalse(x: Any?) {
if (trueWhenString(x) && falseWhenInt(x)) {
x.length
x.<!AMBIGUITY!>inc<!>()
x.<!UNRESOLVED_REFERENCE!>inc<!>()
}
else {
x.<!UNRESOLVED_REFERENCE!>length<!>
x.<!AMBIGUITY!>inc<!>()
x.<!UNRESOLVED_REFERENCE!>inc<!>()
}
}
@@ -63,19 +63,19 @@ fun falsetrue(x: Any?) {
}
else {
x.<!UNRESOLVED_REFERENCE!>length<!>
x.<!AMBIGUITY!>inc<!>()
x.<!UNRESOLVED_REFERENCE!>inc<!>()
}
}
fun falsefalse(x: Any?) {
if (falseWhenString(x) && falseWhenInt(x)) {
x.<!UNRESOLVED_REFERENCE!>length<!>
x.<!AMBIGUITY!>inc<!>()
x.<!UNRESOLVED_REFERENCE!>inc<!>()
}
else {
// Note that we can't argue that we have any of smartcasts here,
// because we don't know which one of both arguments was 'false' to bring us here
x.<!UNRESOLVED_REFERENCE!>length<!>
x.<!AMBIGUITY!>inc<!>()
x.<!NONE_APPLICABLE!>inc<!>()
}
}
}
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.<!AMBIGUITY!>inc<!>()
x.<!INAPPLICABLE_CANDIDATE!>inc<!>()
if (myEqualsNull(x)) {
x.<!AMBIGUITY!>inc<!>()
x.<!INAPPLICABLE_CANDIDATE!>inc<!>()
}
else {
x.inc()
}
x.<!AMBIGUITY!>inc<!>()
x.<!INAPPLICABLE_CANDIDATE!>inc<!>()
}
fun testBasicNotEquals(x: Int?) {
x.<!AMBIGUITY!>inc<!>()
x.<!INAPPLICABLE_CANDIDATE!>inc<!>()
if (myEqualsNotNull(x)) {
x.inc()
}
else {
x.<!AMBIGUITY!>inc<!>()
x.<!INAPPLICABLE_CANDIDATE!>inc<!>()
}
x.<!AMBIGUITY!>inc<!>()
x.<!INAPPLICABLE_CANDIDATE!>inc<!>()
}
compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/operatorsTests/orOperator.fir.kt
Vendored
+7 -7
View File
@@ -36,18 +36,18 @@ fun falseWhenInt(x: Any?): Boolean {
fun truetrue(x: Any?) {
if (trueWhenString(x) || trueWhenInt(x)) {
x.<!UNRESOLVED_REFERENCE!>length<!>
x.<!AMBIGUITY!>inc<!>()
x.<!NONE_APPLICABLE!>inc<!>()
}
else {
x.<!UNRESOLVED_REFERENCE!>length<!>
x.<!AMBIGUITY!>inc<!>()
x.<!UNRESOLVED_REFERENCE!>inc<!>()
}
}
fun truefalse(x: Any?) {
if (trueWhenString(x) || falseWhenInt(x)) {
x.<!UNRESOLVED_REFERENCE!>length<!>
x.<!AMBIGUITY!>inc<!>()
x.<!UNRESOLVED_REFERENCE!>inc<!>()
}
else {
x.<!UNRESOLVED_REFERENCE!>length<!>
@@ -58,21 +58,21 @@ fun truefalse(x: Any?) {
fun falsetrue(x: Any?) {
if (falseWhenString(x) || trueWhenInt(x)) {
x.<!UNRESOLVED_REFERENCE!>length<!>
x.<!AMBIGUITY!>inc<!>()
x.<!UNRESOLVED_REFERENCE!>inc<!>()
}
else {
x.length
x.<!AMBIGUITY!>inc<!>()
x.<!UNRESOLVED_REFERENCE!>inc<!>()
}
}
fun falsefalse(x: Any?) {
if (falseWhenString(x) || falseWhenInt(x)) {
x.<!UNRESOLVED_REFERENCE!>length<!>
x.<!AMBIGUITY!>inc<!>()
x.<!UNRESOLVED_REFERENCE!>inc<!>()
}
else {
x.length
x.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.<!AMBIGUITY!>inc<!>()
x.<!INAPPLICABLE_CANDIDATE!>inc<!>()
}
else {
x.dec()
@@ -26,10 +26,10 @@ class UnstableReceiver {
fun smartcastOnUnstableReceiver() {
if (x.isNull()) {
x.<!AMBIGUITY!>inc<!>()
x.<!INAPPLICABLE_CANDIDATE!>inc<!>()
}
else {
x.<!AMBIGUITY!>dec<!>()
x.<!INAPPLICABLE_CANDIDATE!>dec<!>()
}
}
}
compiler/testData/diagnostics/testsWithStdLib/hugeUnresolvedKotlinxHtml.fir.kt
Vendored
+23 -23
View File
@@ -1,28 +1,28 @@
class A {
fun bar() {
<!AMBIGUITY!>div<!> {
<!AMBIGUITY!>div<!> {
<!AMBIGUITY!>div<!> {
<!AMBIGUITY!>div<!> {
<!AMBIGUITY!>div<!> {
<!AMBIGUITY!>div<!> {
<!AMBIGUITY!>div<!> {
<!AMBIGUITY!>div<!> {
<!AMBIGUITY!>div<!> {
<!AMBIGUITY!>div<!> {
<!AMBIGUITY!>div<!> {
<!AMBIGUITY!>div<!> {
<!AMBIGUITY!>div<!> {
<!AMBIGUITY!>div<!> {
<!AMBIGUITY!>div<!> {
<!AMBIGUITY!>div<!> {
<!AMBIGUITY!>div<!> {
<!AMBIGUITY!>div<!> {
<!AMBIGUITY!>div<!> {
<!AMBIGUITY!>div<!> {
<!AMBIGUITY!>div<!> {
<!AMBIGUITY!>div<!> {
<!AMBIGUITY!>div<!> {
<!UNRESOLVED_REFERENCE!>div<!> {
<!UNRESOLVED_REFERENCE!>div<!> {
<!UNRESOLVED_REFERENCE!>div<!> {
<!UNRESOLVED_REFERENCE!>div<!> {
<!UNRESOLVED_REFERENCE!>div<!> {
<!UNRESOLVED_REFERENCE!>div<!> {
<!UNRESOLVED_REFERENCE!>div<!> {
<!UNRESOLVED_REFERENCE!>div<!> {
<!UNRESOLVED_REFERENCE!>div<!> {
<!UNRESOLVED_REFERENCE!>div<!> {
<!UNRESOLVED_REFERENCE!>div<!> {
<!UNRESOLVED_REFERENCE!>div<!> {
<!UNRESOLVED_REFERENCE!>div<!> {
<!UNRESOLVED_REFERENCE!>div<!> {
<!UNRESOLVED_REFERENCE!>div<!> {
<!UNRESOLVED_REFERENCE!>div<!> {
<!UNRESOLVED_REFERENCE!>div<!> {
<!UNRESOLVED_REFERENCE!>div<!> {
<!UNRESOLVED_REFERENCE!>div<!> {
<!UNRESOLVED_REFERENCE!>div<!> {
<!UNRESOLVED_REFERENCE!>div<!> {
<!UNRESOLVED_REFERENCE!>div<!> {
<!UNRESOLVED_REFERENCE!>div<!> {
<!UNRESOLVED_REFERENCE!>+<!>(<!UNRESOLVED_REFERENCE!>foo<!> ?: "")
<!UNRESOLVED_REFERENCE!>+<!>(<!UNRESOLVED_REFERENCE!>foo<!> ?: "")
<!UNRESOLVED_REFERENCE!>+<!>(<!UNRESOLVED_REFERENCE!>foo<!> ?: "")
compiler/testData/diagnostics/testsWithStdLib/inference/callableReferenceOnParameter.fir.kt
Vendored
+2 -2
View File
@@ -3,6 +3,6 @@
internal class Z<K> {
val map = HashMap<String, String>()
inline fun compute(key: String, producer: () -> String): String {
return map.getOrPut(key, ::producer)
return map.<!INAPPLICABLE_CANDIDATE!>getOrPut<!>(key, <!UNRESOLVED_REFERENCE!>::producer<!>)
}
}
}
compiler/testData/diagnostics/testsWithStdLib/regression/kt37706.fir.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
fun test(): Int {
val sets = (1..100).associateWith { (it..10 * it).mapTo(java.util.TreeSet()) { i -> i } }
val set = sets[50] ?: emptySet()
return set.<!UNRESOLVED_REFERENCE!>size<!>
}
compiler/testData/diagnostics/testsWithStdLib/regression/kt37706.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
fun test(): Int {
val sets = (1..100).associateWith { (it..10 * it).mapTo(java.util.TreeSet()) { i -> i } }
val set = sets[50] ?: emptySet()
compiler/testData/diagnostics/testsWithStdLib/tryCatch/boundedSmartcasts.fir.kt
Vendored
+10 -10
View File
@@ -13,11 +13,11 @@ fun test0(x: Int?) {
if (x != null) {
x.inc()
y.<!AMBIGUITY!>inc<!>()
y.<!INAPPLICABLE_CANDIDATE!>inc<!>()
}
if (y != null) {
x.<!AMBIGUITY!>inc<!>()
x.<!INAPPLICABLE_CANDIDATE!>inc<!>()
y.inc()
}
}
@@ -32,11 +32,11 @@ fun test1(x: Int?) {
if (x != null) {
x.inc()
y.<!AMBIGUITY!>inc<!>()
y.<!INAPPLICABLE_CANDIDATE!>inc<!>()
}
if (y != null) {
x.<!AMBIGUITY!>inc<!>()
x.<!INAPPLICABLE_CANDIDATE!>inc<!>()
y.inc()
}
}
@@ -51,11 +51,11 @@ fun test2(x: Int?) {
if (x != null) {
x.inc()
y.<!AMBIGUITY!>inc<!>()
y.<!INAPPLICABLE_CANDIDATE!>inc<!>()
}
if (y != null) {
x.<!AMBIGUITY!>inc<!>()
x.<!INAPPLICABLE_CANDIDATE!>inc<!>()
y.inc()
}
}
@@ -69,11 +69,11 @@ fun test3(x: Int?) {
if (x != null) {
x.inc()
y.<!AMBIGUITY!>inc<!>()
y.<!INAPPLICABLE_CANDIDATE!>inc<!>()
}
if (y != null) {
x.<!AMBIGUITY!>inc<!>()
x.<!INAPPLICABLE_CANDIDATE!>inc<!>()
y.inc()
}
}
@@ -91,11 +91,11 @@ fun test5(x: Int?) {
if (x != null) {
x.inc()
y.<!AMBIGUITY!>inc<!>()
y.<!INAPPLICABLE_CANDIDATE!>inc<!>()
}
if (y != null) {
x.<!AMBIGUITY!>inc<!>()
x.<!INAPPLICABLE_CANDIDATE!>inc<!>()
y.inc()
}
}
compiler/testData/diagnostics/testsWithStdLib/typealias/typeAliasSamAdapterConstructors2.fir.kt
Vendored
+1 -1
View File
@@ -24,4 +24,4 @@ val test1 = R { }
val test2 = C<String> { s -> println(s.length) }
val test3 = CStr { s -> <!AMBIGUITY!>println<!>(s.<!UNRESOLVED_REFERENCE!>length<!>) }
val test4 = CStrList { ss -> <!NONE_APPLICABLE, UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE!>for (s in ss) { <!AMBIGUITY!>println<!>(s.<!UNRESOLVED_REFERENCE!>length<!>) }<!> }
val test5 = <!INAPPLICABLE_CANDIDATE!>C2<!><Int> { a, b -> val x: Int = a <!AMBIGUITY!>+<!> b; println(x)}
val test5 = <!INAPPLICABLE_CANDIDATE!>C2<!><Int> { a, b -> val x: Int = a <!NONE_APPLICABLE!>+<!> b; println(x)}