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

FIR2IR: select return target inside accessor properly

Browse Source
This commit is contained in:
Mikhail Glukhikh
2021-02-04 15:36:05 +03:00
parent 19bffc694b
commit 694d69fbfa
12 changed files with 365 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/ir/irText/firProblems/SafeLetWithReturn.fir.kt.txt
Vendored
+52
View File
@@ -0,0 +1,52 @@
fun foo(s: String?): String {
{ // BLOCK
val tmp0_safe_receiver: String? = s
when {
EQEQ(arg0 = tmp0_safe_receiver, arg1 = null) -> null
else -> tmp0_safe_receiver.let<String, Nothing>(block = local fun <anonymous>(it: String): Nothing {
return it
}
)
}
} /*~> Unit */
return ""
}
fun bar(s: String?, t: String?): String {
{ // BLOCK
val tmp1_safe_receiver: String? = s
when {
EQEQ(arg0 = tmp1_safe_receiver, arg1 = null) -> null
else -> tmp1_safe_receiver.let<String, Nothing?>(block = local fun <anonymous>(it: String): Nothing? {
return { // BLOCK
val tmp2_safe_receiver: String? = t
when {
EQEQ(arg0 = tmp2_safe_receiver, arg1 = null) -> null
else -> tmp2_safe_receiver.let<String, Nothing>(block = local fun <anonymous>(it: String): Nothing {
return it
}
)
}
}
}
)
}
} /*~> Unit */
return ""
}
val String?.baz: String
get(): String {
{ // BLOCK
val tmp3_safe_receiver: String? = <this>
when {
EQEQ(arg0 = tmp3_safe_receiver, arg1 = null) -> null
else -> tmp3_safe_receiver.let<String, Nothing>(block = local fun <anonymous>(it: String): Nothing {
return it
}
)
}
} /*~> Unit */
return ""
}
compiler/testData/ir/irText/firProblems/SafeLetWithReturn.fir.txt
Vendored
+105
View File
@@ -0,0 +1,105 @@
FILE fqName:<root> fileName:/SafeLetWithReturn.kt
FUN name:foo visibility:public modality:FINAL <> (s:kotlin.String?) returnType:kotlin.String
VALUE_PARAMETER name:s index:0 type:kotlin.String?
BLOCK_BODY
TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
BLOCK type=kotlin.Nothing? origin=SAFE_CALL
VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:kotlin.String? [val]
GET_VAR 's: kotlin.String? declared in <root>.foo' type=kotlin.String? origin=null
WHEN type=kotlin.Nothing? origin=null
BRANCH
if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
arg0: GET_VAR 'val tmp_0: kotlin.String? [val] declared in <root>.foo' type=kotlin.String? origin=null
arg1: CONST Null type=kotlin.Nothing? value=null
then: CONST Null type=kotlin.Nothing? value=null
BRANCH
if: CONST Boolean type=kotlin.Boolean value=true
then: CALL 'public final fun let <T, R> (block: kotlin.Function1<T of kotlin.StandardKt.let, R of kotlin.StandardKt.let>): R of kotlin.StandardKt.let [inline] declared in kotlin.StandardKt' type=kotlin.Nothing origin=null
<T>: kotlin.String
<R>: kotlin.Nothing
$receiver: GET_VAR 'val tmp_0: kotlin.String? [val] declared in <root>.foo' type=kotlin.String? origin=null
block: FUN_EXPR type=kotlin.Function1<kotlin.String, kotlin.Nothing> origin=LAMBDA
FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (it:kotlin.String) returnType:kotlin.Nothing
VALUE_PARAMETER name:it index:0 type:kotlin.String
BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun foo (s: kotlin.String?): kotlin.String declared in <root>'
GET_VAR 'it: kotlin.String declared in <root>.foo.<anonymous>' type=kotlin.String origin=null
RETURN type=kotlin.Nothing from='public final fun foo (s: kotlin.String?): kotlin.String declared in <root>'
CONST String type=kotlin.String value=""
FUN name:bar visibility:public modality:FINAL <> (s:kotlin.String?, t:kotlin.String?) returnType:kotlin.String
VALUE_PARAMETER name:s index:0 type:kotlin.String?
VALUE_PARAMETER name:t index:1 type:kotlin.String?
BLOCK_BODY
TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
BLOCK type=kotlin.Nothing? origin=SAFE_CALL
VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:kotlin.String? [val]
GET_VAR 's: kotlin.String? declared in <root>.bar' type=kotlin.String? origin=null
WHEN type=kotlin.Nothing? origin=null
BRANCH
if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
arg0: GET_VAR 'val tmp_1: kotlin.String? [val] declared in <root>.bar' type=kotlin.String? origin=null
arg1: CONST Null type=kotlin.Nothing? value=null
then: CONST Null type=kotlin.Nothing? value=null
BRANCH
if: CONST Boolean type=kotlin.Boolean value=true
then: CALL 'public final fun let <T, R> (block: kotlin.Function1<T of kotlin.StandardKt.let, R of kotlin.StandardKt.let>): R of kotlin.StandardKt.let [inline] declared in kotlin.StandardKt' type=kotlin.Nothing? origin=null
<T>: kotlin.String
<R>: kotlin.Nothing?
$receiver: GET_VAR 'val tmp_1: kotlin.String? [val] declared in <root>.bar' type=kotlin.String? origin=null
block: FUN_EXPR type=kotlin.Function1<kotlin.String, kotlin.Nothing?> origin=LAMBDA
FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (it:kotlin.String) returnType:kotlin.Nothing?
VALUE_PARAMETER name:it index:0 type:kotlin.String
BLOCK_BODY
RETURN type=kotlin.Nothing from='local final fun <anonymous> (it: kotlin.String): kotlin.Nothing? declared in <root>.bar'
BLOCK type=kotlin.Nothing? origin=SAFE_CALL
VAR IR_TEMPORARY_VARIABLE name:tmp_2 type:kotlin.String? [val]
GET_VAR 't: kotlin.String? declared in <root>.bar' type=kotlin.String? origin=null
WHEN type=kotlin.Nothing? origin=null
BRANCH
if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
arg0: GET_VAR 'val tmp_2: kotlin.String? [val] declared in <root>.bar.<anonymous>' type=kotlin.String? origin=null
arg1: CONST Null type=kotlin.Nothing? value=null
then: CONST Null type=kotlin.Nothing? value=null
BRANCH
if: CONST Boolean type=kotlin.Boolean value=true
then: CALL 'public final fun let <T, R> (block: kotlin.Function1<T of kotlin.StandardKt.let, R of kotlin.StandardKt.let>): R of kotlin.StandardKt.let [inline] declared in kotlin.StandardKt' type=kotlin.Nothing origin=null
<T>: kotlin.String
<R>: kotlin.Nothing
$receiver: GET_VAR 'val tmp_2: kotlin.String? [val] declared in <root>.bar.<anonymous>' type=kotlin.String? origin=null
block: FUN_EXPR type=kotlin.Function1<kotlin.String, kotlin.Nothing> origin=LAMBDA
FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (it:kotlin.String) returnType:kotlin.Nothing
VALUE_PARAMETER name:it index:0 type:kotlin.String
BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun bar (s: kotlin.String?, t: kotlin.String?): kotlin.String declared in <root>'
GET_VAR 'it: kotlin.String declared in <root>.bar.<anonymous>.<anonymous>' type=kotlin.String origin=null
RETURN type=kotlin.Nothing from='public final fun bar (s: kotlin.String?, t: kotlin.String?): kotlin.String declared in <root>'
CONST String type=kotlin.String value=""
PROPERTY name:baz visibility:public modality:FINAL [val]
FUN name:<get-baz> visibility:public modality:FINAL <> ($receiver:kotlin.String?) returnType:kotlin.String
correspondingProperty: PROPERTY name:baz visibility:public modality:FINAL [val]
$receiver: VALUE_PARAMETER name:<this> type:kotlin.String?
BLOCK_BODY
TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
BLOCK type=kotlin.Nothing? origin=SAFE_CALL
VAR IR_TEMPORARY_VARIABLE name:tmp_3 type:kotlin.String? [val]
GET_VAR '<this>: kotlin.String? declared in <root>.<get-baz>' type=kotlin.String? origin=null
WHEN type=kotlin.Nothing? origin=null
BRANCH
if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
arg0: GET_VAR 'val tmp_3: kotlin.String? [val] declared in <root>.<get-baz>' type=kotlin.String? origin=null
arg1: CONST Null type=kotlin.Nothing? value=null
then: CONST Null type=kotlin.Nothing? value=null
BRANCH
if: CONST Boolean type=kotlin.Boolean value=true
then: CALL 'public final fun let <T, R> (block: kotlin.Function1<T of kotlin.StandardKt.let, R of kotlin.StandardKt.let>): R of kotlin.StandardKt.let [inline] declared in kotlin.StandardKt' type=kotlin.Nothing origin=null
<T>: kotlin.String
<R>: kotlin.Nothing
$receiver: GET_VAR 'val tmp_3: kotlin.String? [val] declared in <root>.<get-baz>' type=kotlin.String? origin=null
block: FUN_EXPR type=kotlin.Function1<kotlin.String, kotlin.Nothing> origin=LAMBDA
FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (it:kotlin.String) returnType:kotlin.Nothing
VALUE_PARAMETER name:it index:0 type:kotlin.String
BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun <get-baz> (): kotlin.String declared in <root>'
GET_VAR 'it: kotlin.String declared in <root>.<get-baz>.<anonymous>' type=kotlin.String origin=null
RETURN type=kotlin.Nothing from='public final fun <get-baz> (): kotlin.String declared in <root>'
CONST String type=kotlin.String value=""
compiler/testData/ir/irText/firProblems/SafeLetWithReturn.kt
Vendored
+25
View File
@@ -0,0 +1,25 @@
// WITH_RUNTIME
fun foo(s: String?): String {
s?.let { it ->
return it
}
return ""
}
fun bar(s: String?, t: String?): String {
s?.let {
t?.let {
return it
}
}
return ""
}
val String?.baz: String
get() {
this?.let {
return it
}
return ""
}
compiler/testData/ir/irText/firProblems/SafeLetWithReturn.kt.txt
Vendored
+52
View File
@@ -0,0 +1,52 @@
fun foo(s: String?): String {
{ // BLOCK
val tmp0_safe_receiver: String? = s
when {
EQEQ(arg0 = tmp0_safe_receiver, arg1 = null) -> null
else -> tmp0_safe_receiver.let<String, Nothing>(block = local fun <anonymous>(it: String): Nothing {
return it
}
)
}
} /*~> Unit */
return ""
}
fun bar(s: String?, t: String?): String {
{ // BLOCK
val tmp0_safe_receiver: String? = s
when {
EQEQ(arg0 = tmp0_safe_receiver, arg1 = null) -> null
else -> tmp0_safe_receiver.let<String, Nothing?>(block = local fun <anonymous>(it: String): Nothing? {
{ // BLOCK
val tmp0_safe_receiver: String? = t
when {
EQEQ(arg0 = tmp0_safe_receiver, arg1 = null) -> null
else -> tmp0_safe_receiver.let<String, Nothing>(block = local fun <anonymous>(it: String): Nothing {
return it
}
)
}
} /*~> Unit */
}
)
}
} /*~> Unit */
return ""
}
val String?.baz: String
get(): String {
{ // BLOCK
val tmp0_safe_receiver: String? = <this>
when {
EQEQ(arg0 = tmp0_safe_receiver, arg1 = null) -> null
else -> tmp0_safe_receiver.let<String, Nothing>(block = local fun <anonymous>(it: String): Nothing {
return it
}
)
}
} /*~> Unit */
return ""
}
compiler/testData/ir/irText/firProblems/SafeLetWithReturn.txt
Vendored
+105
View File
@@ -0,0 +1,105 @@
FILE fqName:<root> fileName:/SafeLetWithReturn.kt
FUN name:foo visibility:public modality:FINAL <> (s:kotlin.String?) returnType:kotlin.String
VALUE_PARAMETER name:s index:0 type:kotlin.String?
BLOCK_BODY
TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
BLOCK type=kotlin.Nothing? origin=SAFE_CALL
VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:kotlin.String? [val]
GET_VAR 's: kotlin.String? declared in <root>.foo' type=kotlin.String? origin=null
WHEN type=kotlin.Nothing? origin=null
BRANCH
if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
arg0: GET_VAR 'val tmp_0: kotlin.String? [val] declared in <root>.foo' type=kotlin.String? origin=null
arg1: CONST Null type=kotlin.Nothing? value=null
then: CONST Null type=kotlin.Nothing? value=null
BRANCH
if: CONST Boolean type=kotlin.Boolean value=true
then: CALL 'public final fun let <T, R> (block: kotlin.Function1<T of kotlin.StandardKt.let, R of kotlin.StandardKt.let>): R of kotlin.StandardKt.let [inline] declared in kotlin.StandardKt' type=kotlin.Nothing origin=null
<T>: kotlin.String
<R>: kotlin.Nothing
$receiver: GET_VAR 'val tmp_0: kotlin.String? [val] declared in <root>.foo' type=kotlin.String? origin=null
block: FUN_EXPR type=kotlin.Function1<kotlin.String, kotlin.Nothing> origin=LAMBDA
FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (it:kotlin.String) returnType:kotlin.Nothing
VALUE_PARAMETER name:it index:0 type:kotlin.String
BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun foo (s: kotlin.String?): kotlin.String declared in <root>'
GET_VAR 'it: kotlin.String declared in <root>.foo.<anonymous>' type=kotlin.String origin=null
RETURN type=kotlin.Nothing from='public final fun foo (s: kotlin.String?): kotlin.String declared in <root>'
CONST String type=kotlin.String value=""
FUN name:bar visibility:public modality:FINAL <> (s:kotlin.String?, t:kotlin.String?) returnType:kotlin.String
VALUE_PARAMETER name:s index:0 type:kotlin.String?
VALUE_PARAMETER name:t index:1 type:kotlin.String?
BLOCK_BODY
TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
BLOCK type=kotlin.Nothing? origin=SAFE_CALL
VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:kotlin.String? [val]
GET_VAR 's: kotlin.String? declared in <root>.bar' type=kotlin.String? origin=null
WHEN type=kotlin.Nothing? origin=null
BRANCH
if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
arg0: GET_VAR 'val tmp_1: kotlin.String? [val] declared in <root>.bar' type=kotlin.String? origin=null
arg1: CONST Null type=kotlin.Nothing? value=null
then: CONST Null type=kotlin.Nothing? value=null
BRANCH
if: CONST Boolean type=kotlin.Boolean value=true
then: CALL 'public final fun let <T, R> (block: kotlin.Function1<T of kotlin.StandardKt.let, R of kotlin.StandardKt.let>): R of kotlin.StandardKt.let [inline] declared in kotlin.StandardKt' type=kotlin.Nothing? origin=null
<T>: kotlin.String
<R>: kotlin.Nothing?
$receiver: GET_VAR 'val tmp_1: kotlin.String? [val] declared in <root>.bar' type=kotlin.String? origin=null
block: FUN_EXPR type=kotlin.Function1<kotlin.String, kotlin.Nothing?> origin=LAMBDA
FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (it:kotlin.String) returnType:kotlin.Nothing?
VALUE_PARAMETER name:it index:0 type:kotlin.String
BLOCK_BODY
TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
BLOCK type=kotlin.Nothing? origin=SAFE_CALL
VAR IR_TEMPORARY_VARIABLE name:tmp_2 type:kotlin.String? [val]
GET_VAR 't: kotlin.String? declared in <root>.bar' type=kotlin.String? origin=null
WHEN type=kotlin.Nothing? origin=null
BRANCH
if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
arg0: GET_VAR 'val tmp_2: kotlin.String? [val] declared in <root>.bar.<anonymous>' type=kotlin.String? origin=null
arg1: CONST Null type=kotlin.Nothing? value=null
then: CONST Null type=kotlin.Nothing? value=null
BRANCH
if: CONST Boolean type=kotlin.Boolean value=true
then: CALL 'public final fun let <T, R> (block: kotlin.Function1<T of kotlin.StandardKt.let, R of kotlin.StandardKt.let>): R of kotlin.StandardKt.let [inline] declared in kotlin.StandardKt' type=kotlin.Nothing origin=null
<T>: kotlin.String
<R>: kotlin.Nothing
$receiver: GET_VAR 'val tmp_2: kotlin.String? [val] declared in <root>.bar.<anonymous>' type=kotlin.String? origin=null
block: FUN_EXPR type=kotlin.Function1<kotlin.String, kotlin.Nothing> origin=LAMBDA
FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (it:kotlin.String) returnType:kotlin.Nothing
VALUE_PARAMETER name:it index:0 type:kotlin.String
BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun bar (s: kotlin.String?, t: kotlin.String?): kotlin.String declared in <root>'
GET_VAR 'it: kotlin.String declared in <root>.bar.<anonymous>.<anonymous>' type=kotlin.String origin=null
RETURN type=kotlin.Nothing from='public final fun bar (s: kotlin.String?, t: kotlin.String?): kotlin.String declared in <root>'
CONST String type=kotlin.String value=""
PROPERTY name:baz visibility:public modality:FINAL [val]
FUN name:<get-baz> visibility:public modality:FINAL <> ($receiver:kotlin.String?) returnType:kotlin.String
correspondingProperty: PROPERTY name:baz visibility:public modality:FINAL [val]
$receiver: VALUE_PARAMETER name:<this> type:kotlin.String?
BLOCK_BODY
TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
BLOCK type=kotlin.Nothing? origin=SAFE_CALL
VAR IR_TEMPORARY_VARIABLE name:tmp_3 type:kotlin.String? [val]
GET_VAR '<this>: kotlin.String? declared in <root>.<get-baz>' type=kotlin.String? origin=null
WHEN type=kotlin.Nothing? origin=null
BRANCH
if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
arg0: GET_VAR 'val tmp_3: kotlin.String? [val] declared in <root>.<get-baz>' type=kotlin.String? origin=null
arg1: CONST Null type=kotlin.Nothing? value=null
then: CONST Null type=kotlin.Nothing? value=null
BRANCH
if: CONST Boolean type=kotlin.Boolean value=true
then: CALL 'public final fun let <T, R> (block: kotlin.Function1<T of kotlin.StandardKt.let, R of kotlin.StandardKt.let>): R of kotlin.StandardKt.let [inline] declared in kotlin.StandardKt' type=kotlin.Nothing origin=null
<T>: kotlin.String
<R>: kotlin.Nothing
$receiver: GET_VAR 'val tmp_3: kotlin.String? [val] declared in <root>.<get-baz>' type=kotlin.String? origin=null
block: FUN_EXPR type=kotlin.Function1<kotlin.String, kotlin.Nothing> origin=LAMBDA
FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (it:kotlin.String) returnType:kotlin.Nothing
VALUE_PARAMETER name:it index:0 type:kotlin.String
BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun <get-baz> (): kotlin.String declared in <root>'
GET_VAR 'it: kotlin.String declared in <root>.<get-baz>.<anonymous>' type=kotlin.String origin=null
RETURN type=kotlin.Nothing from='public final fun <get-baz> (): kotlin.String declared in <root>'
CONST String type=kotlin.String value=""