From 3518fcf78cefb53ec8183ab5f7a9908138ac6e68 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Thu, 6 Feb 2020 22:44:30 +0300 Subject: [PATCH] Fix psi2ir tests broken by 7249d2f889972c619c0adc19bde9cfc6bacd883e --- .../ir/irText/expressions/whenReturn.txt | 38 +++++++++++++++++++ .../ir/irText/lambdas/justLambda.fir.txt | 26 +++++++++++++ .../testData/ir/irText/lambdas/justLambda.kt | 1 - .../testData/ir/irText/lambdas/justLambda.txt | 3 +- 4 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 compiler/testData/ir/irText/expressions/whenReturn.txt create mode 100644 compiler/testData/ir/irText/lambdas/justLambda.fir.txt diff --git a/compiler/testData/ir/irText/expressions/whenReturn.txt b/compiler/testData/ir/irText/expressions/whenReturn.txt new file mode 100644 index 00000000000..3b8cb956d90 --- /dev/null +++ b/compiler/testData/ir/irText/expressions/whenReturn.txt @@ -0,0 +1,38 @@ +FILE fqName: fileName:/whenReturn.kt + FUN name:toString visibility:public modality:FINAL <> (grade:kotlin.String) returnType:kotlin.String + VALUE_PARAMETER name:grade index:0 type:kotlin.String + BLOCK_BODY + BLOCK type=kotlin.Unit origin=WHEN + VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:kotlin.String [val] + GET_VAR 'grade: kotlin.String declared in .toString' type=kotlin.String origin=null + WHEN type=kotlin.Unit origin=WHEN + 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 .toString' type=kotlin.String origin=null + arg1: CONST String type=kotlin.String value="A" + then: RETURN type=kotlin.Nothing from='public final fun toString (grade: kotlin.String): kotlin.String declared in ' + CONST String type=kotlin.String value="Excellent" + 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 .toString' type=kotlin.String origin=null + arg1: CONST String type=kotlin.String value="B" + then: RETURN type=kotlin.Nothing from='public final fun toString (grade: kotlin.String): kotlin.String declared in ' + CONST String type=kotlin.String value="Good" + 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 .toString' type=kotlin.String origin=null + arg1: CONST String type=kotlin.String value="C" + then: RETURN type=kotlin.Nothing from='public final fun toString (grade: kotlin.String): kotlin.String declared in ' + CONST String type=kotlin.String value="Mediocre" + 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 .toString' type=kotlin.String origin=null + arg1: CONST String type=kotlin.String value="D" + then: RETURN type=kotlin.Nothing from='public final fun toString (grade: kotlin.String): kotlin.String declared in ' + CONST String type=kotlin.String value="Fair" + BRANCH + if: CONST Boolean type=kotlin.Boolean value=true + then: RETURN type=kotlin.Nothing from='public final fun toString (grade: kotlin.String): kotlin.String declared in ' + CONST String type=kotlin.String value="Failure" + RETURN type=kotlin.Nothing from='public final fun toString (grade: kotlin.String): kotlin.String declared in ' + CONST String type=kotlin.String value="???" diff --git a/compiler/testData/ir/irText/lambdas/justLambda.fir.txt b/compiler/testData/ir/irText/lambdas/justLambda.fir.txt new file mode 100644 index 00000000000..e9ee1d38fef --- /dev/null +++ b/compiler/testData/ir/irText/lambdas/justLambda.fir.txt @@ -0,0 +1,26 @@ +FILE fqName: fileName:/justLambda.kt + PROPERTY name:test1 visibility:public modality:FINAL [val] + FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Function0 visibility:private [final,static] + EXPRESSION_BODY + FUN_EXPR type=kotlin.Function0 origin=LAMBDA + FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.Int + BLOCK_BODY + RETURN type=kotlin.Nothing from='local final fun (): kotlin.Int declared in .test1' + CONST Int type=kotlin.Int value=42 + FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Function0 + correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val] + BLOCK_BODY + RETURN type=kotlin.Nothing from='public final fun (): kotlin.Function0 declared in ' + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Function0 visibility:private [final,static]' type=kotlin.Function0 origin=null + PROPERTY name:test2 visibility:public modality:FINAL [val] + FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Function0 visibility:private [final,static] + EXPRESSION_BODY + FUN_EXPR type=kotlin.Function0 origin=LAMBDA + FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.Unit + BLOCK_BODY + GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit + FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Function0 + correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [val] + BLOCK_BODY + RETURN type=kotlin.Nothing from='public final fun (): kotlin.Function0 declared in ' + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Function0 visibility:private [final,static]' type=kotlin.Function0 origin=null diff --git a/compiler/testData/ir/irText/lambdas/justLambda.kt b/compiler/testData/ir/irText/lambdas/justLambda.kt index 274aabf0789..3fb4136b231 100644 --- a/compiler/testData/ir/irText/lambdas/justLambda.kt +++ b/compiler/testData/ir/irText/lambdas/justLambda.kt @@ -1,4 +1,3 @@ -// FIR_IDENTICAL val test1 = { 42 } val test2 = { } \ No newline at end of file diff --git a/compiler/testData/ir/irText/lambdas/justLambda.txt b/compiler/testData/ir/irText/lambdas/justLambda.txt index e9ee1d38fef..9a0cc50ffb4 100644 --- a/compiler/testData/ir/irText/lambdas/justLambda.txt +++ b/compiler/testData/ir/irText/lambdas/justLambda.txt @@ -18,7 +18,8 @@ FILE fqName: fileName:/justLambda.kt FUN_EXPR type=kotlin.Function0 origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY - GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit + RETURN type=kotlin.Nothing from='local final fun (): kotlin.Unit declared in .test2' + GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Function0 correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [val] BLOCK_BODY