From 56b729f1812733cb6a79673684c2fa5c4c6b3475 Mon Sep 17 00:00:00 2001 From: Sergej Jaskiewicz Date: Wed, 31 May 2023 12:39:15 +0200 Subject: [PATCH] [test] Fix failing IR dump test --- .../selfReferentialAnnotation.fir.ir.txt | 30 +++++++++---------- .../selfReferentialAnnotation.ir.txt | 30 +++++++++---------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/compiler/testData/codegen/box/annotations/selfReferentialAnnotation.fir.ir.txt b/compiler/testData/codegen/box/annotations/selfReferentialAnnotation.fir.ir.txt index 87b6de5437a..3c3d95d2d18 100644 --- a/compiler/testData/codegen/box/annotations/selfReferentialAnnotation.fir.ir.txt +++ b/compiler/testData/codegen/box/annotations/selfReferentialAnnotation.fir.ir.txt @@ -6,7 +6,7 @@ FILE fqName: fileName:/selfReferentialAnnotation.kt annotations: Ann(e = '1') BLOCK_BODY - DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' + DELEGATING_CONSTRUCTOR_CALL 'public constructor () declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ANNOTATION_CLASS name:Ann modality:OPEN visibility:public superTypes:[kotlin.Annotation]' PROPERTY name:e visibility:public modality:FINAL [val] FIELD PROPERTY_BACKING_FIELD name:e type:kotlin.Int visibility:private [final] @@ -21,16 +21,16 @@ FILE fqName: fileName:/selfReferentialAnnotation.kt receiver: GET_VAR ': .Ann declared in .Ann.' type=.Ann origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: - public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in kotlin.Annotation + public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Annotation $this: VALUE_PARAMETER name: type:kotlin.Any VALUE_PARAMETER name:other index:0 type:kotlin.Any? FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override] overridden: - public open fun hashCode (): kotlin.Int [fake_override] declared in kotlin.Annotation + public open fun hashCode (): kotlin.Int declared in kotlin.Annotation $this: VALUE_PARAMETER name: type:kotlin.Any FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override] overridden: - public open fun toString (): kotlin.String [fake_override] declared in kotlin.Annotation + public open fun toString (): kotlin.String declared in kotlin.Annotation $this: VALUE_PARAMETER name: type:kotlin.Any CLASS ANNOTATION_CLASS name:MyRequiresOptIn modality:OPEN visibility:public superTypes:[kotlin.Annotation] annotations: @@ -46,7 +46,7 @@ FILE fqName: fileName:/selfReferentialAnnotation.kt EXPRESSION_BODY GET_ENUM 'ENUM_ENTRY name:ERROR' type=.MyRequiresOptIn.MyLevel BLOCK_BODY - DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' + DELEGATING_CONSTRUCTOR_CALL 'public constructor () declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ANNOTATION_CLASS name:MyRequiresOptIn modality:OPEN visibility:public superTypes:[kotlin.Annotation]' PROPERTY name:a visibility:public modality:FINAL [val] FIELD PROPERTY_BACKING_FIELD name:a type:kotlin.String visibility:private [final] @@ -74,15 +74,15 @@ FILE fqName: fileName:/selfReferentialAnnotation.kt $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.MyRequiresOptIn.MyLevel CONSTRUCTOR visibility:private <> () returnType:.MyRequiresOptIn.MyLevel [primary] BLOCK_BODY - ENUM_CONSTRUCTOR_CALL 'public constructor (name: kotlin.String, ordinal: kotlin.Int) [primary] declared in kotlin.Enum' + ENUM_CONSTRUCTOR_CALL 'public constructor (name: kotlin.String, ordinal: kotlin.Int) declared in kotlin.Enum' : .MyRequiresOptIn.MyLevel INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:MyLevel modality:FINAL visibility:public superTypes:[kotlin.Enum<.MyRequiresOptIn.MyLevel>]' ENUM_ENTRY name:WARNING init: EXPRESSION_BODY - ENUM_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .MyRequiresOptIn.MyLevel' + ENUM_CONSTRUCTOR_CALL 'private constructor () declared in .MyRequiresOptIn.MyLevel' ENUM_ENTRY name:ERROR init: EXPRESSION_BODY - ENUM_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .MyRequiresOptIn.MyLevel' + ENUM_CONSTRUCTOR_CALL 'private constructor () declared in .MyRequiresOptIn.MyLevel' FUN ENUM_CLASS_SPECIAL_MEMBER name:values visibility:public modality:FINAL <> () returnType:kotlin.Array<.MyRequiresOptIn.MyLevel> SYNTHETIC_BODY kind=ENUM_VALUES FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.MyRequiresOptIn.MyLevel @@ -98,12 +98,12 @@ FILE fqName: fileName:/selfReferentialAnnotation.kt $this: VALUE_PARAMETER name: type:kotlin.Enum FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum, other:.MyRequiresOptIn.MyLevel) returnType:kotlin.Int [fake_override,operator] overridden: - public final fun compareTo (other: E of kotlin.Enum): kotlin.Int [operator] declared in kotlin.Enum + public final fun compareTo (other: E of kotlin.Enum): kotlin.Int declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum VALUE_PARAMETER name:other index:0 type:.MyRequiresOptIn.MyLevel FUN FAKE_OVERRIDE name:equals visibility:public modality:FINAL <> ($this:kotlin.Enum, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: - public final fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Enum + public final fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum VALUE_PARAMETER name:other index:0 type:kotlin.Any? FUN FAKE_OVERRIDE name:hashCode visibility:public modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Int [fake_override] @@ -118,7 +118,7 @@ FILE fqName: fileName:/selfReferentialAnnotation.kt annotations: IntrinsicConstEvaluation overridden: - public final name: kotlin.String [val] + public final name: kotlin.String FUN FAKE_OVERRIDE name: visibility:public modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.String [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:name visibility:public modality:FINAL [fake_override,val] overridden: @@ -126,7 +126,7 @@ FILE fqName: fileName:/selfReferentialAnnotation.kt $this: VALUE_PARAMETER name: type:kotlin.Enum PROPERTY FAKE_OVERRIDE name:ordinal visibility:public modality:FINAL [fake_override,val] overridden: - public final ordinal: kotlin.Int [val] + public final ordinal: kotlin.Int FUN FAKE_OVERRIDE name: visibility:public modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Int [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:ordinal visibility:public modality:FINAL [fake_override,val] overridden: @@ -142,16 +142,16 @@ FILE fqName: fileName:/selfReferentialAnnotation.kt $this: VALUE_PARAMETER name: type:kotlin.Enum FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: - public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in kotlin.Annotation + public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Annotation $this: VALUE_PARAMETER name: type:kotlin.Any VALUE_PARAMETER name:other index:0 type:kotlin.Any? FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override] overridden: - public open fun hashCode (): kotlin.Int [fake_override] declared in kotlin.Annotation + public open fun hashCode (): kotlin.Int declared in kotlin.Annotation $this: VALUE_PARAMETER name: type:kotlin.Any FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override] overridden: - public open fun toString (): kotlin.String [fake_override] declared in kotlin.Annotation + public open fun toString (): kotlin.String declared in kotlin.Annotation $this: VALUE_PARAMETER name: type:kotlin.Any FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String BLOCK_BODY diff --git a/compiler/testData/codegen/box/annotations/selfReferentialAnnotation.ir.txt b/compiler/testData/codegen/box/annotations/selfReferentialAnnotation.ir.txt index 879ab251f42..ebe40ad3a72 100644 --- a/compiler/testData/codegen/box/annotations/selfReferentialAnnotation.ir.txt +++ b/compiler/testData/codegen/box/annotations/selfReferentialAnnotation.ir.txt @@ -6,7 +6,7 @@ FILE fqName: fileName:/selfReferentialAnnotation.kt annotations: Ann(e = '1') BLOCK_BODY - DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' + DELEGATING_CONSTRUCTOR_CALL 'public constructor () declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ANNOTATION_CLASS name:Ann modality:OPEN visibility:public superTypes:[kotlin.Annotation]' PROPERTY name:e visibility:public modality:FINAL [val] FIELD PROPERTY_BACKING_FIELD name:e type:kotlin.Int visibility:private [final] @@ -21,16 +21,16 @@ FILE fqName: fileName:/selfReferentialAnnotation.kt receiver: GET_VAR ': .Ann declared in .Ann.' type=.Ann origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: - public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in kotlin.Annotation + public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Annotation $this: VALUE_PARAMETER name: type:kotlin.Any VALUE_PARAMETER name:other index:0 type:kotlin.Any? FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override] overridden: - public open fun hashCode (): kotlin.Int [fake_override] declared in kotlin.Annotation + public open fun hashCode (): kotlin.Int declared in kotlin.Annotation $this: VALUE_PARAMETER name: type:kotlin.Any FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override] overridden: - public open fun toString (): kotlin.String [fake_override] declared in kotlin.Annotation + public open fun toString (): kotlin.String declared in kotlin.Annotation $this: VALUE_PARAMETER name: type:kotlin.Any CLASS ANNOTATION_CLASS name:MyRequiresOptIn modality:OPEN visibility:public superTypes:[kotlin.Annotation] annotations: @@ -46,7 +46,7 @@ FILE fqName: fileName:/selfReferentialAnnotation.kt EXPRESSION_BODY GET_ENUM 'ENUM_ENTRY name:ERROR' type=.MyRequiresOptIn.MyLevel BLOCK_BODY - DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' + DELEGATING_CONSTRUCTOR_CALL 'public constructor () declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ANNOTATION_CLASS name:MyRequiresOptIn modality:OPEN visibility:public superTypes:[kotlin.Annotation]' PROPERTY name:a visibility:public modality:FINAL [val] FIELD PROPERTY_BACKING_FIELD name:a type:kotlin.String visibility:private [final] @@ -74,20 +74,20 @@ FILE fqName: fileName:/selfReferentialAnnotation.kt $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.MyRequiresOptIn.MyLevel CONSTRUCTOR visibility:private <> () returnType:.MyRequiresOptIn.MyLevel [primary] BLOCK_BODY - ENUM_CONSTRUCTOR_CALL 'public constructor (name: kotlin.String, ordinal: kotlin.Int) [primary] declared in kotlin.Enum' + ENUM_CONSTRUCTOR_CALL 'public constructor (name: kotlin.String, ordinal: kotlin.Int) declared in kotlin.Enum' : .MyRequiresOptIn.MyLevel INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:MyLevel modality:FINAL visibility:public superTypes:[kotlin.Enum<.MyRequiresOptIn.MyLevel>]' ENUM_ENTRY name:WARNING init: EXPRESSION_BODY - ENUM_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .MyRequiresOptIn.MyLevel' + ENUM_CONSTRUCTOR_CALL 'private constructor () declared in .MyRequiresOptIn.MyLevel' ENUM_ENTRY name:ERROR init: EXPRESSION_BODY - ENUM_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .MyRequiresOptIn.MyLevel' + ENUM_CONSTRUCTOR_CALL 'private constructor () declared in .MyRequiresOptIn.MyLevel' PROPERTY FAKE_OVERRIDE name:name visibility:public modality:FINAL [fake_override,val] annotations: IntrinsicConstEvaluation overridden: - public final name: kotlin.String [val] + public final name: kotlin.String FUN FAKE_OVERRIDE name: visibility:public modality:FINAL <> ($this:kotlin.Enum<.MyRequiresOptIn.MyLevel>) returnType:kotlin.String [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:name visibility:public modality:FINAL [fake_override,val] overridden: @@ -95,7 +95,7 @@ FILE fqName: fileName:/selfReferentialAnnotation.kt $this: VALUE_PARAMETER name: type:kotlin.Enum<.MyRequiresOptIn.MyLevel> PROPERTY FAKE_OVERRIDE name:ordinal visibility:public modality:FINAL [fake_override,val] overridden: - public final ordinal: kotlin.Int [val] + public final ordinal: kotlin.Int FUN FAKE_OVERRIDE name: visibility:public modality:FINAL <> ($this:kotlin.Enum<.MyRequiresOptIn.MyLevel>) returnType:kotlin.Int [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:ordinal visibility:public modality:FINAL [fake_override,val] overridden: @@ -107,12 +107,12 @@ FILE fqName: fileName:/selfReferentialAnnotation.kt $this: VALUE_PARAMETER name: type:kotlin.Enum<.MyRequiresOptIn.MyLevel> FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.MyRequiresOptIn.MyLevel>, other:.MyRequiresOptIn.MyLevel) returnType:kotlin.Int [fake_override,operator] overridden: - public final fun compareTo (other: E of kotlin.Enum): kotlin.Int [operator] declared in kotlin.Enum + public final fun compareTo (other: E of kotlin.Enum): kotlin.Int declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.MyRequiresOptIn.MyLevel> VALUE_PARAMETER name:other index:0 type:.MyRequiresOptIn.MyLevel FUN FAKE_OVERRIDE name:equals visibility:public modality:FINAL <> ($this:kotlin.Enum<.MyRequiresOptIn.MyLevel>, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: - public final fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Enum + public final fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Enum $this: VALUE_PARAMETER name: type:kotlin.Enum<.MyRequiresOptIn.MyLevel> VALUE_PARAMETER name:other index:0 type:kotlin.Any? FUN FAKE_OVERRIDE name:finalize visibility:protected/*protected and package*/ modality:FINAL <> ($this:kotlin.Enum<.MyRequiresOptIn.MyLevel>) returnType:kotlin.Unit [fake_override] @@ -142,16 +142,16 @@ FILE fqName: fileName:/selfReferentialAnnotation.kt SYNTHETIC_BODY kind=ENUM_ENTRIES FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: - public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in kotlin.Annotation + public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Annotation $this: VALUE_PARAMETER name: type:kotlin.Any VALUE_PARAMETER name:other index:0 type:kotlin.Any? FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override] overridden: - public open fun hashCode (): kotlin.Int [fake_override] declared in kotlin.Annotation + public open fun hashCode (): kotlin.Int declared in kotlin.Annotation $this: VALUE_PARAMETER name: type:kotlin.Any FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override] overridden: - public open fun toString (): kotlin.String [fake_override] declared in kotlin.Annotation + public open fun toString (): kotlin.String declared in kotlin.Annotation $this: VALUE_PARAMETER name: type:kotlin.Any FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String BLOCK_BODY