Revert "[FIR] Fix missing RETURN_TYPE_MISMATCH for labeled return statements"

This reverts commit 8e72f60996

Since some intellij tests are failing
This commit is contained in:
Ivan Kochurkin
2023-09-20 12:28:49 +02:00
parent e9d4de658d
commit 063835488f
9 changed files with 21 additions and 37 deletions
@@ -1,6 +1,6 @@
fun test(a: Int) {
run f@{
if (a > 0) <!RETURN_TYPE_MISMATCH!>return@f<!>
if (a > 0) return@f
else return@f 1
}
}
@@ -0,0 +1,6 @@
val flag = true
val a = b@ {
if (flag) return@b 4
return@b
}
@@ -1,7 +1,6 @@
// FIR_IDENTICAL
val flag = true
val a = b@ {
if (flag) return@b <!RETURN_TYPE_MISMATCH!>4<!>
return@b
}
}
@@ -14,7 +14,7 @@ val b = run {
// Unit
val c = run {
if (flag) <!RETURN_TYPE_MISMATCH!>return@run<!>
if (flag) return@run
return@run 4
}
}
@@ -1,6 +1,6 @@
fun test(a: Int) {
run<Int>f@{
if (a > 0) return@f <!ARGUMENT_TYPE_MISMATCH, RETURN_TYPE_MISMATCH!>""<!>
if (a > 0) return@f <!ARGUMENT_TYPE_MISMATCH!>""<!>
return@f 1
}
@@ -20,7 +20,7 @@ fun test(a: A<out CharSequence>, z: Out<CharSequence>) {
a.bar { <!ARGUMENT_TYPE_MISMATCH, TYPE_MISMATCH!>z.id()<!> }
a.foo {
z.foobar(if (1 > 2) return@foo <!ARGUMENT_TYPE_MISMATCH, RETURN_TYPE_MISMATCH!>""<!> else "")
z.foobar(if (1 > 2) return@foo <!ARGUMENT_TYPE_MISMATCH!>""<!> else "")
<!ARGUMENT_TYPE_MISMATCH!>""<!>
}
}
@@ -32,9 +32,9 @@ fun foo() {
// Doesn't work both in K1 and K2, but probably should (KT-58232 for tracking)
val dates3 = <!NEW_INFERENCE_ERROR!>myRun {
when {
else -> return@myRun <!RETURN_TYPE_MISMATCH!>buildList {
else -> return@myRun buildList {
add(4)
}<!>
}
}
}<!>
}