From 960fba3c4e741d8aba1ec1b0bbecc963cd3580e1 Mon Sep 17 00:00:00 2001 From: Roman Artemev Date: Fri, 15 Jun 2018 15:34:29 +0300 Subject: [PATCH] Fix test failures --- .../ir/irText/classes/dataClassWithArrayMembers.txt | 6 +++--- compiler/testData/ir/irText/classes/dataClasses.txt | 6 +++--- .../testData/ir/irText/classes/dataClassesGeneric.txt | 8 ++++---- .../irText/classes/lambdaInDataClassDefaultParameter.txt | 4 ++-- .../irText/declarations/parameters/dataClassMembers.txt | 2 +- .../testData/ir/irText/lambdas/destructuringInLambda.txt | 2 +- .../ir/sourceRanges/synthesizedDataClassMembers.txt | 2 +- .../box/expression/typeCheck/simpleAsInterface.kt | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/compiler/testData/ir/irText/classes/dataClassWithArrayMembers.txt b/compiler/testData/ir/irText/classes/dataClassWithArrayMembers.txt index 3ca532548b7..52089f8871b 100644 --- a/compiler/testData/ir/irText/classes/dataClassWithArrayMembers.txt +++ b/compiler/testData/ir/irText/classes/dataClassWithArrayMembers.txt @@ -370,7 +370,7 @@ FILE fqName: fileName:/dataClassWithArrayMembers.kt then: RETURN type=kotlin.Nothing from='equals(Any?): Boolean' CONST Boolean type=kotlin.Boolean value=false VAR IR_TEMPORARY_VARIABLE name:tmp0_other_with_cast type:Test1 flags:val - TYPE_OP type=Test1 origin=CAST typeOperand=Test1 + TYPE_OP type=Test1 origin=IMPLICIT_CAST typeOperand=Test1 typeOperand: CLASS CLASS name:Test1 modality:FINAL visibility:public flags:data GET_VAR 'value-parameter other: Any?' type=kotlin.Any? origin=null WHEN type=kotlin.Unit origin=null @@ -552,7 +552,7 @@ FILE fqName: fileName:/dataClassWithArrayMembers.kt then: RETURN type=kotlin.Nothing from='equals(Any?): Boolean' CONST Boolean type=kotlin.Boolean value=false VAR IR_TEMPORARY_VARIABLE name:tmp0_other_with_cast type:Test2 flags:val - TYPE_OP type=Test2 origin=CAST typeOperand=Test2 + TYPE_OP type=Test2 origin=IMPLICIT_CAST typeOperand=Test2 typeOperand: CLASS CLASS name:Test2 modality:FINAL visibility:public flags:data GET_VAR 'value-parameter other: Any?' type=kotlin.Any? origin=null WHEN type=kotlin.Unit origin=null @@ -661,7 +661,7 @@ FILE fqName: fileName:/dataClassWithArrayMembers.kt then: RETURN type=kotlin.Nothing from='equals(Any?): Boolean' CONST Boolean type=kotlin.Boolean value=false VAR IR_TEMPORARY_VARIABLE name:tmp0_other_with_cast type:Test3 flags:val - TYPE_OP type=Test3 origin=CAST typeOperand=Test3 + TYPE_OP type=Test3 origin=IMPLICIT_CAST typeOperand=Test3 typeOperand: CLASS CLASS name:Test3 modality:FINAL visibility:public flags:data GET_VAR 'value-parameter other: Any?' type=kotlin.Any? origin=null WHEN type=kotlin.Unit origin=null diff --git a/compiler/testData/ir/irText/classes/dataClasses.txt b/compiler/testData/ir/irText/classes/dataClasses.txt index 4893173444a..51ae34934a5 100644 --- a/compiler/testData/ir/irText/classes/dataClasses.txt +++ b/compiler/testData/ir/irText/classes/dataClasses.txt @@ -151,7 +151,7 @@ FILE fqName: fileName:/dataClasses.kt then: RETURN type=kotlin.Nothing from='equals(Any?): Boolean' CONST Boolean type=kotlin.Boolean value=false VAR IR_TEMPORARY_VARIABLE name:tmp0_other_with_cast type:Test1 flags:val - TYPE_OP type=Test1 origin=CAST typeOperand=Test1 + TYPE_OP type=Test1 origin=IMPLICIT_CAST typeOperand=Test1 typeOperand: CLASS CLASS name:Test1 modality:FINAL visibility:public flags:data GET_VAR 'value-parameter other: Any?' type=kotlin.Any? origin=null WHEN type=kotlin.Unit origin=null @@ -279,7 +279,7 @@ FILE fqName: fileName:/dataClasses.kt then: RETURN type=kotlin.Nothing from='equals(Any?): Boolean' CONST Boolean type=kotlin.Boolean value=false VAR IR_TEMPORARY_VARIABLE name:tmp0_other_with_cast type:Test2 flags:val - TYPE_OP type=Test2 origin=CAST typeOperand=Test2 + TYPE_OP type=Test2 origin=IMPLICIT_CAST typeOperand=Test2 typeOperand: CLASS CLASS name:Test2 modality:FINAL visibility:public flags:data GET_VAR 'value-parameter other: Any?' type=kotlin.Any? origin=null WHEN type=kotlin.Unit origin=null @@ -503,7 +503,7 @@ FILE fqName: fileName:/dataClasses.kt then: RETURN type=kotlin.Nothing from='equals(Any?): Boolean' CONST Boolean type=kotlin.Boolean value=false VAR IR_TEMPORARY_VARIABLE name:tmp0_other_with_cast type:Test3 flags:val - TYPE_OP type=Test3 origin=CAST typeOperand=Test3 + TYPE_OP type=Test3 origin=IMPLICIT_CAST typeOperand=Test3 typeOperand: CLASS CLASS name:Test3 modality:FINAL visibility:public flags:data GET_VAR 'value-parameter other: Any?' type=kotlin.Any? origin=null WHEN type=kotlin.Unit origin=null diff --git a/compiler/testData/ir/irText/classes/dataClassesGeneric.txt b/compiler/testData/ir/irText/classes/dataClassesGeneric.txt index e8dae654639..bae7a712140 100644 --- a/compiler/testData/ir/irText/classes/dataClassesGeneric.txt +++ b/compiler/testData/ir/irText/classes/dataClassesGeneric.txt @@ -96,7 +96,7 @@ FILE fqName: fileName:/dataClassesGeneric.kt then: RETURN type=kotlin.Nothing from='equals(Any?): Boolean' CONST Boolean type=kotlin.Boolean value=false VAR IR_TEMPORARY_VARIABLE name:tmp0_other_with_cast type:Test1 flags:val - TYPE_OP type=Test1 origin=CAST typeOperand=Test1 + TYPE_OP type=Test1 origin=IMPLICIT_CAST typeOperand=Test1 typeOperand: CLASS CLASS name:Test1 modality:FINAL visibility:public flags:data GET_VAR 'value-parameter other: Any?' type=kotlin.Any? origin=null WHEN type=kotlin.Unit origin=null @@ -197,7 +197,7 @@ FILE fqName: fileName:/dataClassesGeneric.kt then: RETURN type=kotlin.Nothing from='equals(Any?): Boolean' CONST Boolean type=kotlin.Boolean value=false VAR IR_TEMPORARY_VARIABLE name:tmp0_other_with_cast type:Test2 flags:val - TYPE_OP type=Test2 origin=CAST typeOperand=Test2 + TYPE_OP type=Test2 origin=IMPLICIT_CAST typeOperand=Test2 typeOperand: CLASS CLASS name:Test2 modality:FINAL visibility:public flags:data GET_VAR 'value-parameter other: Any?' type=kotlin.Any? origin=null WHEN type=kotlin.Unit origin=null @@ -298,7 +298,7 @@ FILE fqName: fileName:/dataClassesGeneric.kt then: RETURN type=kotlin.Nothing from='equals(Any?): Boolean' CONST Boolean type=kotlin.Boolean value=false VAR IR_TEMPORARY_VARIABLE name:tmp0_other_with_cast type:Test3 flags:val - TYPE_OP type=Test3 origin=CAST typeOperand=Test3 + TYPE_OP type=Test3 origin=IMPLICIT_CAST typeOperand=Test3 typeOperand: CLASS CLASS name:Test3 modality:FINAL visibility:public flags:data GET_VAR 'value-parameter other: Any?' type=kotlin.Any? origin=null WHEN type=kotlin.Unit origin=null @@ -395,7 +395,7 @@ FILE fqName: fileName:/dataClassesGeneric.kt then: RETURN type=kotlin.Nothing from='equals(Any?): Boolean' CONST Boolean type=kotlin.Boolean value=false VAR IR_TEMPORARY_VARIABLE name:tmp0_other_with_cast type:Test4 flags:val - TYPE_OP type=Test4 origin=CAST typeOperand=Test4 + TYPE_OP type=Test4 origin=IMPLICIT_CAST typeOperand=Test4 typeOperand: CLASS CLASS name:Test4 modality:FINAL visibility:public flags:data GET_VAR 'value-parameter other: Any?' type=kotlin.Any? origin=null WHEN type=kotlin.Unit origin=null diff --git a/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.txt b/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.txt index 1ad93e73f4b..adfce770076 100644 --- a/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.txt +++ b/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.txt @@ -90,7 +90,7 @@ FILE fqName: fileName:/lambdaInDataClassDefaultParameter.kt then: RETURN type=kotlin.Nothing from='equals(Any?): Boolean' CONST Boolean type=kotlin.Boolean value=false VAR IR_TEMPORARY_VARIABLE name:tmp0_other_with_cast type:A flags:val - TYPE_OP type=A origin=CAST typeOperand=A + TYPE_OP type=A origin=IMPLICIT_CAST typeOperand=A typeOperand: CLASS CLASS name:A modality:FINAL visibility:public flags:data GET_VAR 'value-parameter other: Any?' type=kotlin.Any? origin=null WHEN type=kotlin.Unit origin=null @@ -211,7 +211,7 @@ FILE fqName: fileName:/lambdaInDataClassDefaultParameter.kt then: RETURN type=kotlin.Nothing from='equals(Any?): Boolean' CONST Boolean type=kotlin.Boolean value=false VAR IR_TEMPORARY_VARIABLE name:tmp0_other_with_cast type:B flags:val - TYPE_OP type=B origin=CAST typeOperand=B + TYPE_OP type=B origin=IMPLICIT_CAST typeOperand=B typeOperand: CLASS CLASS name:B modality:FINAL visibility:public flags:data GET_VAR 'value-parameter other: Any?' type=kotlin.Any? origin=null WHEN type=kotlin.Unit origin=null diff --git a/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.txt b/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.txt index e810dc6232f..bdc96f65342 100644 --- a/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.txt +++ b/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.txt @@ -133,7 +133,7 @@ FILE fqName: fileName:/dataClassMembers.kt then: RETURN type=kotlin.Nothing from='equals(Any?): Boolean' CONST Boolean type=kotlin.Boolean value=false VAR IR_TEMPORARY_VARIABLE name:tmp0_other_with_cast type:Test flags:val - TYPE_OP type=Test origin=CAST typeOperand=Test + TYPE_OP type=Test origin=IMPLICIT_CAST typeOperand=Test typeOperand: CLASS CLASS name:Test modality:FINAL visibility:public flags:data GET_VAR 'value-parameter other: Any?' type=kotlin.Any? origin=null WHEN type=kotlin.Unit origin=null diff --git a/compiler/testData/ir/irText/lambdas/destructuringInLambda.txt b/compiler/testData/ir/irText/lambdas/destructuringInLambda.txt index f567c08d426..d5d590ebcd6 100644 --- a/compiler/testData/ir/irText/lambdas/destructuringInLambda.txt +++ b/compiler/testData/ir/irText/lambdas/destructuringInLambda.txt @@ -116,7 +116,7 @@ FILE fqName: fileName:/destructuringInLambda.kt then: RETURN type=kotlin.Nothing from='equals(Any?): Boolean' CONST Boolean type=kotlin.Boolean value=false VAR IR_TEMPORARY_VARIABLE name:tmp0_other_with_cast type:A flags:val - TYPE_OP type=A origin=CAST typeOperand=A + TYPE_OP type=A origin=IMPLICIT_CAST typeOperand=A typeOperand: CLASS CLASS name:A modality:FINAL visibility:public flags:data GET_VAR 'value-parameter other: Any?' type=kotlin.Any? origin=null WHEN type=kotlin.Unit origin=null diff --git a/compiler/testData/ir/sourceRanges/synthesizedDataClassMembers.txt b/compiler/testData/ir/sourceRanges/synthesizedDataClassMembers.txt index 480b0a649b7..2082fd74e24 100644 --- a/compiler/testData/ir/sourceRanges/synthesizedDataClassMembers.txt +++ b/compiler/testData/ir/sourceRanges/synthesizedDataClassMembers.txt @@ -139,7 +139,7 @@ @0:0..4:1 RETURN type=kotlin.Nothing from='equals(Any?): Boolean' @0:0..4:1 CONST Boolean type=kotlin.Boolean value=false @0:0..4:1 VAR IR_TEMPORARY_VARIABLE name:tmp0_other_with_cast type:C flags:val - @0:0..4:1 TYPE_OP type=C origin=CAST typeOperand=C + @0:0..4:1 TYPE_OP type=C origin=IMPLICIT_CAST typeOperand=C @0:0..4:1 GET_VAR 'value-parameter other: Any?' type=kotlin.Any? origin=null @0:0..4:1 WHEN type=kotlin.Unit origin=null @0:0..4:1 BRANCH diff --git a/js/js.translator/testData/box/expression/typeCheck/simpleAsInterface.kt b/js/js.translator/testData/box/expression/typeCheck/simpleAsInterface.kt index ac0a2458ba9..6c51cc395fa 100644 --- a/js/js.translator/testData/box/expression/typeCheck/simpleAsInterface.kt +++ b/js/js.translator/testData/box/expression/typeCheck/simpleAsInterface.kt @@ -1,4 +1,4 @@ -// EXPECTED_REACHABLE_NODES: 1108 +// EXPECTED_REACHABLE_NODES: 1232 package foo