From fdf4f477a6ecfc594d6c0a13588aebf825ebacf6 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Tue, 18 Feb 2020 10:48:11 +0300 Subject: [PATCH] FIR2IR: fix problems with enum entry / anonymous object visibility --- .../fir/backend/Fir2IrDeclarationStorage.kt | 10 ++-- .../irText/classes/delegatedImplementation.kt | 1 - .../testData/ir/irText/classes/enum.fir.txt | 48 +++++++++---------- compiler/testData/ir/irText/classes/enum.kt | 1 - .../irText/classes/enumClassModality.fir.txt | 28 +++++------ .../ir/irText/classes/enumClassModality.kt | 1 - .../classes/enumWithMultipleCtors.fir.txt | 12 ++--- .../irText/classes/enumWithMultipleCtors.kt | 1 - .../classes/enumWithSecondaryCtor.fir.txt | 20 ++++---- .../irText/classes/enumWithSecondaryCtor.kt | 1 - .../lambdaInDataClassDefaultParameter.kt | 1 - .../classes/objectLiteralExpressions.kt | 1 - .../enumEntriesWithAnnotations.fir.txt | 8 ++-- .../annotations/enumEntriesWithAnnotations.kt | 1 - .../enumsInAnnotationArguments.fir.txt | 16 +++---- .../annotations/enumsInAnnotationArguments.kt | 1 - .../multiplatform/expectedEnumClass.fir.txt | 20 ++++---- .../multiplatform/expectedEnumClass.kt | 1 - .../expressions/enumEntryAsReceiver.fir.txt | 4 +- .../irText/expressions/enumEntryAsReceiver.kt | 1 - ...umEntryReferenceFromEnumEntryClass.fir.txt | 4 +- .../enumEntryReferenceFromEnumEntryClass.kt | 1 - .../expressions/funInterface/partialSam.kt | 1 - .../expressions/multipleThisReferences.kt | 1 - .../expressions/objectAsCallable.fir.txt | 4 +- .../ir/irText/expressions/objectAsCallable.kt | 1 - .../ir/irText/expressions/objectReference.kt | 1 - .../temporaryInEnumEntryInitializer.fir.txt | 4 +- .../temporaryInEnumEntryInitializer.kt | 1 - .../expressions/thisOfGenericOuterClass.kt | 1 - .../thisReferenceBeforeClassDeclared.kt | 1 - .../ir/irText/expressions/values.fir.txt | 4 +- .../testData/ir/irText/expressions/values.kt | 1 - .../ir/irText/singletons/enumEntry.fir.txt | 4 +- .../ir/irText/singletons/enumEntry.kt | 1 - 35 files changed, 94 insertions(+), 113 deletions(-) diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt index 34e236c15e4..0c54810dc0b 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt @@ -275,12 +275,13 @@ class Fir2IrDeclarationStorage( val descriptor = WrappedClassDescriptor() val origin = IrDeclarationOrigin.DEFINED val modality = Modality.FINAL + val visibility = Visibilities.LOCAL return anonymousObject.convertWithOffsets { startOffset, endOffset -> - irSymbolTable.declareClass(startOffset, endOffset, origin, descriptor, modality) { symbol -> + irSymbolTable.declareClass(startOffset, endOffset, origin, descriptor, modality, visibility) { symbol -> IrClassImpl( startOffset, endOffset, origin, symbol, Name.special(""), anonymousObject.classKind, - Visibilities.LOCAL, modality, + visibility, modality, isCompanion = false, isInner = false, isData = false, isExternal = false, isInline = false, isExpect = false, isFun = false ).apply { @@ -295,12 +296,13 @@ class Fir2IrDeclarationStorage( val descriptor = WrappedClassDescriptor() val origin = IrDeclarationOrigin.DEFINED val modality = Modality.FINAL + val visibility = Visibilities.PRIVATE return anonymousObject.convertWithOffsets { startOffset, endOffset -> - irSymbolTable.declareClass(startOffset, endOffset, origin, descriptor, modality) { symbol -> + irSymbolTable.declareClass(startOffset, endOffset, origin, descriptor, modality, visibility) { symbol -> IrClassImpl( startOffset, endOffset, origin, symbol, enumEntry.name, anonymousObject.classKind, - Visibilities.LOCAL, modality, + visibility, modality, isCompanion = false, isInner = false, isData = false, isExternal = false, isInline = false, isExpect = false, isFun = false ).apply { diff --git a/compiler/testData/ir/irText/classes/delegatedImplementation.kt b/compiler/testData/ir/irText/classes/delegatedImplementation.kt index 5e8f66d8cc5..c5c17b1381d 100644 --- a/compiler/testData/ir/irText/classes/delegatedImplementation.kt +++ b/compiler/testData/ir/irText/classes/delegatedImplementation.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: ANY interface IBase { fun foo(x: Int, s: String) fun bar(): Int diff --git a/compiler/testData/ir/irText/classes/enum.fir.txt b/compiler/testData/ir/irText/classes/enum.fir.txt index aa66a7f1102..3976e5a0fbd 100644 --- a/compiler/testData/ir/irText/classes/enum.fir.txt +++ b/compiler/testData/ir/irText/classes/enum.fir.txt @@ -6,19 +6,19 @@ FILE fqName: fileName:/enum.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:TestEnum1 modality:FINAL visibility:public superTypes:[kotlin.Enum<.TestEnum1>]' ENUM_ENTRY name:TEST1 - class: CLASS ENUM_ENTRY name:TEST1 modality:FINAL visibility:local superTypes:[.TestEnum1] + class: CLASS ENUM_ENTRY name:TEST1 modality:FINAL visibility:private superTypes:[.TestEnum1] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestEnum1.TEST1 CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .TestEnum1' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:TEST1 modality:FINAL visibility:local superTypes:[.TestEnum1]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:TEST1 modality:FINAL visibility:private superTypes:[.TestEnum1]' ENUM_ENTRY name:TEST2 - class: CLASS ENUM_ENTRY name:TEST2 modality:FINAL visibility:local superTypes:[.TestEnum1] + class: CLASS ENUM_ENTRY name:TEST2 modality:FINAL visibility:private superTypes:[.TestEnum1] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestEnum1.TEST2 CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .TestEnum1' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:TEST2 modality:FINAL visibility:local superTypes:[.TestEnum1]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:TEST2 modality:FINAL visibility:private superTypes:[.TestEnum1]' FUN name:values visibility:public modality:FINAL <> ($this:.TestEnum1) returnType:kotlin.Array<.TestEnum1> $this: VALUE_PARAMETER name: type:.TestEnum1 BLOCK_BODY @@ -79,29 +79,29 @@ FILE fqName: fileName:/enum.kt GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .TestEnum2 declared in .TestEnum2.' type=.TestEnum2 origin=null ENUM_ENTRY name:TEST1 - class: CLASS ENUM_ENTRY name:TEST1 modality:FINAL visibility:local superTypes:[.TestEnum2] + class: CLASS ENUM_ENTRY name:TEST1 modality:FINAL visibility:private superTypes:[.TestEnum2] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestEnum2.TEST1 CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor (x: kotlin.Int) [primary] declared in .TestEnum2' x: CONST Int type=kotlin.Int value=1 - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:TEST1 modality:FINAL visibility:local superTypes:[.TestEnum2]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:TEST1 modality:FINAL visibility:private superTypes:[.TestEnum2]' ENUM_ENTRY name:TEST2 - class: CLASS ENUM_ENTRY name:TEST2 modality:FINAL visibility:local superTypes:[.TestEnum2] + class: CLASS ENUM_ENTRY name:TEST2 modality:FINAL visibility:private superTypes:[.TestEnum2] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestEnum2.TEST2 CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor (x: kotlin.Int) [primary] declared in .TestEnum2' x: CONST Int type=kotlin.Int value=2 - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:TEST2 modality:FINAL visibility:local superTypes:[.TestEnum2]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:TEST2 modality:FINAL visibility:private superTypes:[.TestEnum2]' ENUM_ENTRY name:TEST3 - class: CLASS ENUM_ENTRY name:TEST3 modality:FINAL visibility:local superTypes:[.TestEnum2] + class: CLASS ENUM_ENTRY name:TEST3 modality:FINAL visibility:private superTypes:[.TestEnum2] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestEnum2.TEST3 CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor (x: kotlin.Int) [primary] declared in .TestEnum2' x: CONST Int type=kotlin.Int value=3 - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:TEST3 modality:FINAL visibility:local superTypes:[.TestEnum2]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:TEST3 modality:FINAL visibility:private superTypes:[.TestEnum2]' FUN name:values visibility:public modality:FINAL <> ($this:.TestEnum2) returnType:kotlin.Array<.TestEnum2> $this: VALUE_PARAMETER name: type:.TestEnum2 BLOCK_BODY @@ -150,12 +150,12 @@ FILE fqName: fileName:/enum.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:TestEnum3 modality:FINAL visibility:public superTypes:[kotlin.Enum<.TestEnum3>]' ENUM_ENTRY name:TEST - class: CLASS ENUM_ENTRY name:TEST modality:FINAL visibility:local superTypes:[.TestEnum3] + class: CLASS ENUM_ENTRY name:TEST modality:FINAL visibility:private superTypes:[.TestEnum3] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestEnum3.TEST CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .TestEnum3' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:TEST modality:FINAL visibility:local superTypes:[.TestEnum3]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:TEST modality:FINAL visibility:private superTypes:[.TestEnum3]' FUN name:foo visibility:public modality:FINAL <> ($this:.TestEnum3.TEST) returnType:kotlin.Unit $this: VALUE_PARAMETER name: type:.TestEnum3.TEST BLOCK_BODY @@ -223,26 +223,26 @@ FILE fqName: fileName:/enum.kt GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .TestEnum4 declared in .TestEnum4.' type=.TestEnum4 origin=null ENUM_ENTRY name:TEST1 - class: CLASS ENUM_ENTRY name:TEST1 modality:FINAL visibility:local superTypes:[.TestEnum4] + class: CLASS ENUM_ENTRY name:TEST1 modality:FINAL visibility:private superTypes:[.TestEnum4] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestEnum4.TEST1 CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor (x: kotlin.Int) [primary] declared in .TestEnum4' x: CONST Int type=kotlin.Int value=1 - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:TEST1 modality:FINAL visibility:local superTypes:[.TestEnum4]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:TEST1 modality:FINAL visibility:private superTypes:[.TestEnum4]' FUN name:foo visibility:public modality:FINAL <> ($this:.TestEnum4.TEST1) returnType:kotlin.Unit $this: VALUE_PARAMETER name: type:.TestEnum4.TEST1 BLOCK_BODY CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: GET_ENUM 'ENUM_ENTRY name:TEST1' type=.TestEnum4 ENUM_ENTRY name:TEST2 - class: CLASS ENUM_ENTRY name:TEST2 modality:FINAL visibility:local superTypes:[.TestEnum4] + class: CLASS ENUM_ENTRY name:TEST2 modality:FINAL visibility:private superTypes:[.TestEnum4] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestEnum4.TEST2 CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor (x: kotlin.Int) [primary] declared in .TestEnum4' x: CONST Int type=kotlin.Int value=2 - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:TEST2 modality:FINAL visibility:local superTypes:[.TestEnum4]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:TEST2 modality:FINAL visibility:private superTypes:[.TestEnum4]' PROPERTY name:z visibility:public modality:FINAL [val] FIELD PROPERTY_BACKING_FIELD name:z type:kotlin.Int visibility:private [final] FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestEnum4.TEST2) returnType:kotlin.Int @@ -326,27 +326,27 @@ FILE fqName: fileName:/enum.kt GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .TestEnum5 declared in .TestEnum5.' type=.TestEnum5 origin=null ENUM_ENTRY name:TEST1 - class: CLASS ENUM_ENTRY name:TEST1 modality:FINAL visibility:local superTypes:[.TestEnum5] + class: CLASS ENUM_ENTRY name:TEST1 modality:FINAL visibility:private superTypes:[.TestEnum5] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestEnum5.TEST1 CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor (x: kotlin.Int) [primary] declared in .TestEnum5' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:TEST1 modality:FINAL visibility:local superTypes:[.TestEnum5]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:TEST1 modality:FINAL visibility:private superTypes:[.TestEnum5]' ENUM_ENTRY name:TEST2 - class: CLASS ENUM_ENTRY name:TEST2 modality:FINAL visibility:local superTypes:[.TestEnum5] + class: CLASS ENUM_ENTRY name:TEST2 modality:FINAL visibility:private superTypes:[.TestEnum5] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestEnum5.TEST2 CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor (x: kotlin.Int) [primary] declared in .TestEnum5' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:TEST2 modality:FINAL visibility:local superTypes:[.TestEnum5]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:TEST2 modality:FINAL visibility:private superTypes:[.TestEnum5]' ENUM_ENTRY name:TEST3 - class: CLASS ENUM_ENTRY name:TEST3 modality:FINAL visibility:local superTypes:[.TestEnum5] + class: CLASS ENUM_ENTRY name:TEST3 modality:FINAL visibility:private superTypes:[.TestEnum5] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestEnum5.TEST3 CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor (x: kotlin.Int) [primary] declared in .TestEnum5' x: CONST Int type=kotlin.Int value=0 - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:TEST3 modality:FINAL visibility:local superTypes:[.TestEnum5]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:TEST3 modality:FINAL visibility:private superTypes:[.TestEnum5]' FUN name:values visibility:public modality:FINAL <> ($this:.TestEnum5) returnType:kotlin.Array<.TestEnum5> $this: VALUE_PARAMETER name: type:.TestEnum5 BLOCK_BODY @@ -423,14 +423,14 @@ FILE fqName: fileName:/enum.kt GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .TestEnum6 declared in .TestEnum6.' type=.TestEnum6 origin=null ENUM_ENTRY name:TEST - class: CLASS ENUM_ENTRY name:TEST modality:FINAL visibility:local superTypes:[.TestEnum6] + class: CLASS ENUM_ENTRY name:TEST modality:FINAL visibility:private superTypes:[.TestEnum6] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestEnum6.TEST CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor (x: kotlin.Int, y: kotlin.Int) [primary] declared in .TestEnum6' x: CALL 'public final fun f (): kotlin.Int declared in ' type=kotlin.Int origin=null y: CALL 'public final fun f (): kotlin.Int declared in ' type=kotlin.Int origin=null - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:TEST modality:FINAL visibility:local superTypes:[.TestEnum6]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:TEST modality:FINAL visibility:private superTypes:[.TestEnum6]' FUN name:values visibility:public modality:FINAL <> ($this:.TestEnum6) returnType:kotlin.Array<.TestEnum6> $this: VALUE_PARAMETER name: type:.TestEnum6 BLOCK_BODY diff --git a/compiler/testData/ir/irText/classes/enum.kt b/compiler/testData/ir/irText/classes/enum.kt index 1882ee5c190..c39bad34580 100644 --- a/compiler/testData/ir/irText/classes/enum.kt +++ b/compiler/testData/ir/irText/classes/enum.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: ANY // WITH_RUNTIME enum class TestEnum1 { diff --git a/compiler/testData/ir/irText/classes/enumClassModality.fir.txt b/compiler/testData/ir/irText/classes/enumClassModality.fir.txt index d9b537e7a18..dd1f1eace80 100644 --- a/compiler/testData/ir/irText/classes/enumClassModality.fir.txt +++ b/compiler/testData/ir/irText/classes/enumClassModality.fir.txt @@ -6,12 +6,12 @@ FILE fqName: fileName:/enumClassModality.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:TestFinalEnum1 modality:FINAL visibility:public superTypes:[kotlin.Enum<.TestFinalEnum1>]' ENUM_ENTRY name:X1 - class: CLASS ENUM_ENTRY name:X1 modality:FINAL visibility:local superTypes:[.TestFinalEnum1] + class: CLASS ENUM_ENTRY name:X1 modality:FINAL visibility:private superTypes:[.TestFinalEnum1] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestFinalEnum1.X1 CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .TestFinalEnum1' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:X1 modality:FINAL visibility:local superTypes:[.TestFinalEnum1]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:X1 modality:FINAL visibility:private superTypes:[.TestFinalEnum1]' FUN name:values visibility:public modality:FINAL <> ($this:.TestFinalEnum1) returnType:kotlin.Array<.TestFinalEnum1> $this: VALUE_PARAMETER name: type:.TestFinalEnum1 BLOCK_BODY @@ -72,13 +72,13 @@ FILE fqName: fileName:/enumClassModality.kt GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .TestFinalEnum2 declared in .TestFinalEnum2.' type=.TestFinalEnum2 origin=null ENUM_ENTRY name:X1 - class: CLASS ENUM_ENTRY name:X1 modality:FINAL visibility:local superTypes:[.TestFinalEnum2] + class: CLASS ENUM_ENTRY name:X1 modality:FINAL visibility:private superTypes:[.TestFinalEnum2] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestFinalEnum2.X1 CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor (x: kotlin.Int) [primary] declared in .TestFinalEnum2' x: CONST Int type=kotlin.Int value=1 - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:X1 modality:FINAL visibility:local superTypes:[.TestFinalEnum2]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:X1 modality:FINAL visibility:private superTypes:[.TestFinalEnum2]' FUN name:values visibility:public modality:FINAL <> ($this:.TestFinalEnum2) returnType:kotlin.Array<.TestFinalEnum2> $this: VALUE_PARAMETER name: type:.TestFinalEnum2 BLOCK_BODY @@ -127,12 +127,12 @@ FILE fqName: fileName:/enumClassModality.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:TestFinalEnum3 modality:FINAL visibility:public superTypes:[kotlin.Enum<.TestFinalEnum3>]' ENUM_ENTRY name:X1 - class: CLASS ENUM_ENTRY name:X1 modality:FINAL visibility:local superTypes:[.TestFinalEnum3] + class: CLASS ENUM_ENTRY name:X1 modality:FINAL visibility:private superTypes:[.TestFinalEnum3] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestFinalEnum3.X1 CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .TestFinalEnum3' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:X1 modality:FINAL visibility:local superTypes:[.TestFinalEnum3]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:X1 modality:FINAL visibility:private superTypes:[.TestFinalEnum3]' FUN name:doStuff visibility:public modality:FINAL <> ($this:.TestFinalEnum3) returnType:kotlin.Unit $this: VALUE_PARAMETER name: type:.TestFinalEnum3 BLOCK_BODY @@ -184,12 +184,12 @@ FILE fqName: fileName:/enumClassModality.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:TestOpenEnum1 modality:FINAL visibility:public superTypes:[kotlin.Enum<.TestOpenEnum1>]' ENUM_ENTRY name:X1 - class: CLASS ENUM_ENTRY name:X1 modality:FINAL visibility:local superTypes:[.TestOpenEnum1] + class: CLASS ENUM_ENTRY name:X1 modality:FINAL visibility:private superTypes:[.TestOpenEnum1] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestOpenEnum1.X1 CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .TestOpenEnum1' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:X1 modality:FINAL visibility:local superTypes:[.TestOpenEnum1]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:X1 modality:FINAL visibility:private superTypes:[.TestOpenEnum1]' FUN name:toString visibility:public modality:FINAL <> ($this:.TestOpenEnum1.X1) returnType:kotlin.String $this: VALUE_PARAMETER name: type:.TestOpenEnum1.X1 BLOCK_BODY @@ -243,12 +243,12 @@ FILE fqName: fileName:/enumClassModality.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:TestOpenEnum2 modality:FINAL visibility:public superTypes:[kotlin.Enum<.TestOpenEnum2>]' ENUM_ENTRY name:X1 - class: CLASS ENUM_ENTRY name:X1 modality:FINAL visibility:local superTypes:[.TestOpenEnum2] + class: CLASS ENUM_ENTRY name:X1 modality:FINAL visibility:private superTypes:[.TestOpenEnum2] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestOpenEnum2.X1 CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .TestOpenEnum2' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:X1 modality:FINAL visibility:local superTypes:[.TestOpenEnum2]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:X1 modality:FINAL visibility:private superTypes:[.TestOpenEnum2]' FUN name:foo visibility:public modality:FINAL <> ($this:.TestOpenEnum2.X1) returnType:kotlin.Unit $this: VALUE_PARAMETER name: type:.TestOpenEnum2.X1 BLOCK_BODY @@ -303,12 +303,12 @@ FILE fqName: fileName:/enumClassModality.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:TestAbstractEnum1 modality:FINAL visibility:public superTypes:[kotlin.Enum<.TestAbstractEnum1>]' ENUM_ENTRY name:X1 - class: CLASS ENUM_ENTRY name:X1 modality:FINAL visibility:local superTypes:[.TestAbstractEnum1] + class: CLASS ENUM_ENTRY name:X1 modality:FINAL visibility:private superTypes:[.TestAbstractEnum1] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestAbstractEnum1.X1 CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .TestAbstractEnum1' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:X1 modality:FINAL visibility:local superTypes:[.TestAbstractEnum1]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:X1 modality:FINAL visibility:private superTypes:[.TestAbstractEnum1]' FUN name:foo visibility:public modality:FINAL <> ($this:.TestAbstractEnum1.X1) returnType:kotlin.Unit $this: VALUE_PARAMETER name: type:.TestAbstractEnum1.X1 BLOCK_BODY @@ -379,12 +379,12 @@ FILE fqName: fileName:/enumClassModality.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:TestAbstractEnum2 modality:FINAL visibility:public superTypes:[.IFoo; kotlin.Enum<.TestAbstractEnum2>]' ENUM_ENTRY name:X1 - class: CLASS ENUM_ENTRY name:X1 modality:FINAL visibility:local superTypes:[.TestAbstractEnum2] + class: CLASS ENUM_ENTRY name:X1 modality:FINAL visibility:private superTypes:[.TestAbstractEnum2] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestAbstractEnum2.X1 CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .TestAbstractEnum2' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:X1 modality:FINAL visibility:local superTypes:[.TestAbstractEnum2]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:X1 modality:FINAL visibility:private superTypes:[.TestAbstractEnum2]' FUN name:foo visibility:public modality:FINAL <> ($this:.TestAbstractEnum2.X1) returnType:kotlin.Unit $this: VALUE_PARAMETER name: type:.TestAbstractEnum2.X1 BLOCK_BODY diff --git a/compiler/testData/ir/irText/classes/enumClassModality.kt b/compiler/testData/ir/irText/classes/enumClassModality.kt index bbe7e5194e9..7096f0638fd 100644 --- a/compiler/testData/ir/irText/classes/enumClassModality.kt +++ b/compiler/testData/ir/irText/classes/enumClassModality.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: ANY enum class TestFinalEnum1 { X1 } diff --git a/compiler/testData/ir/irText/classes/enumWithMultipleCtors.fir.txt b/compiler/testData/ir/irText/classes/enumWithMultipleCtors.fir.txt index 54b2b5c9fd9..e2f8b72d9f1 100644 --- a/compiler/testData/ir/irText/classes/enumWithMultipleCtors.fir.txt +++ b/compiler/testData/ir/irText/classes/enumWithMultipleCtors.fir.txt @@ -2,20 +2,20 @@ FILE fqName: fileName:/enumWithMultipleCtors.kt CLASS ENUM_CLASS name:A modality:FINAL visibility:public superTypes:[kotlin.Enum<.A>] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.A ENUM_ENTRY name:X - class: CLASS ENUM_ENTRY name:X modality:FINAL visibility:local superTypes:[.A] + class: CLASS ENUM_ENTRY name:X modality:FINAL visibility:private superTypes:[.A] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.A.X CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor (arg: kotlin.String) declared in .A' arg: CONST String type=kotlin.String value="asd" - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:X modality:FINAL visibility:local superTypes:[.A]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:X modality:FINAL visibility:private superTypes:[.A]' ENUM_ENTRY name:Y - class: CLASS ENUM_ENTRY name:Y modality:FINAL visibility:local superTypes:[.A] + class: CLASS ENUM_ENTRY name:Y modality:FINAL visibility:private superTypes:[.A] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.A.Y CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor (arg: kotlin.String) declared in .A' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:Y modality:FINAL visibility:local superTypes:[.A]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:Y modality:FINAL visibility:private superTypes:[.A]' FUN name:f visibility:public modality:FINAL <> ($this:.A.Y) returnType:kotlin.String $this: VALUE_PARAMETER name: type:.A.Y BLOCK_BODY @@ -25,13 +25,13 @@ FILE fqName: fileName:/enumWithMultipleCtors.kt $this: GET_VAR ': .A.Y declared in .A.Y.f' type=.A.Y origin=null other: CONST String type=kotlin.String value="#Y" ENUM_ENTRY name:Z - class: CLASS ENUM_ENTRY name:Z modality:FINAL visibility:local superTypes:[.A] + class: CLASS ENUM_ENTRY name:Z modality:FINAL visibility:private superTypes:[.A] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.A.Z CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor (arg: kotlin.String) declared in .A' arg: CONST Int type=kotlin.Int value=5 - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:Z modality:FINAL visibility:local superTypes:[.A]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:Z modality:FINAL visibility:private superTypes:[.A]' PROPERTY name:prop1 visibility:public modality:FINAL [val] FIELD PROPERTY_BACKING_FIELD name:prop1 type:kotlin.String visibility:private [final] FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.A) returnType:kotlin.String diff --git a/compiler/testData/ir/irText/classes/enumWithMultipleCtors.kt b/compiler/testData/ir/irText/classes/enumWithMultipleCtors.kt index cb72e56ed8a..d8d225effde 100644 --- a/compiler/testData/ir/irText/classes/enumWithMultipleCtors.kt +++ b/compiler/testData/ir/irText/classes/enumWithMultipleCtors.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: ANY enum class A { X("asd"), Y() { diff --git a/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.fir.txt b/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.fir.txt index 92b4a333dee..c289c3fb2dc 100644 --- a/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.fir.txt +++ b/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.fir.txt @@ -18,12 +18,12 @@ FILE fqName: fileName:/enumWithSecondaryCtor.kt GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .Test0 declared in .Test0.' type=.Test0 origin=null ENUM_ENTRY name:ZERO - class: CLASS ENUM_ENTRY name:ZERO modality:FINAL visibility:local superTypes:[.Test0] + class: CLASS ENUM_ENTRY name:ZERO modality:FINAL visibility:private superTypes:[.Test0] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Test0.ZERO CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor (x: kotlin.Int) [primary] declared in .Test0' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:ZERO modality:FINAL visibility:local superTypes:[.Test0]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:ZERO modality:FINAL visibility:private superTypes:[.Test0]' CONSTRUCTOR visibility:private <> () returnType:.Test0 BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor (x: kotlin.Int) [primary] declared in .Test0' @@ -88,20 +88,20 @@ FILE fqName: fileName:/enumWithSecondaryCtor.kt GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .Test1 declared in .Test1.' type=.Test1 origin=null ENUM_ENTRY name:ZERO - class: CLASS ENUM_ENTRY name:ZERO modality:FINAL visibility:local superTypes:[.Test1] + class: CLASS ENUM_ENTRY name:ZERO modality:FINAL visibility:private superTypes:[.Test1] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Test1.ZERO CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor (x: kotlin.Int) [primary] declared in .Test1' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:ZERO modality:FINAL visibility:local superTypes:[.Test1]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:ZERO modality:FINAL visibility:private superTypes:[.Test1]' ENUM_ENTRY name:ONE - class: CLASS ENUM_ENTRY name:ONE modality:FINAL visibility:local superTypes:[.Test1] + class: CLASS ENUM_ENTRY name:ONE modality:FINAL visibility:private superTypes:[.Test1] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Test1.ONE CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor (x: kotlin.Int) [primary] declared in .Test1' x: CONST Int type=kotlin.Int value=1 - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:ONE modality:FINAL visibility:local superTypes:[.Test1]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:ONE modality:FINAL visibility:private superTypes:[.Test1]' CONSTRUCTOR visibility:private <> () returnType:.Test1 BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor (x: kotlin.Int) [primary] declared in .Test1' @@ -166,25 +166,25 @@ FILE fqName: fileName:/enumWithSecondaryCtor.kt GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .Test2 declared in .Test2.' type=.Test2 origin=null ENUM_ENTRY name:ZERO - class: CLASS ENUM_ENTRY name:ZERO modality:FINAL visibility:local superTypes:[.Test2] + class: CLASS ENUM_ENTRY name:ZERO modality:FINAL visibility:private superTypes:[.Test2] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Test2.ZERO CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor (x: kotlin.Int) [primary] declared in .Test2' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:ZERO modality:FINAL visibility:local superTypes:[.Test2]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:ZERO modality:FINAL visibility:private superTypes:[.Test2]' FUN name:foo visibility:public modality:FINAL <> ($this:.Test2.ZERO) returnType:kotlin.Unit $this: VALUE_PARAMETER name: type:.Test2.ZERO BLOCK_BODY CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: CONST String type=kotlin.String value="ZERO" ENUM_ENTRY name:ONE - class: CLASS ENUM_ENTRY name:ONE modality:FINAL visibility:local superTypes:[.Test2] + class: CLASS ENUM_ENTRY name:ONE modality:FINAL visibility:private superTypes:[.Test2] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Test2.ONE CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor (x: kotlin.Int) [primary] declared in .Test2' x: CONST Int type=kotlin.Int value=1 - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:ONE modality:FINAL visibility:local superTypes:[.Test2]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:ONE modality:FINAL visibility:private superTypes:[.Test2]' FUN name:foo visibility:public modality:FINAL <> ($this:.Test2.ONE) returnType:kotlin.Unit $this: VALUE_PARAMETER name: type:.Test2.ONE BLOCK_BODY diff --git a/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.kt b/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.kt index 3f86674f660..7ec4a50769c 100644 --- a/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.kt +++ b/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: ANY // WITH_RUNTIME enum class Test0(val x: Int) { diff --git a/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.kt b/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.kt index 5e34b0f6f61..f58d8d63f3b 100644 --- a/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.kt +++ b/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: ANY data class A(val runA: A.(String) -> Unit = {}) data class B(val x: Any = object {}) \ No newline at end of file diff --git a/compiler/testData/ir/irText/classes/objectLiteralExpressions.kt b/compiler/testData/ir/irText/classes/objectLiteralExpressions.kt index a3a0b845c4d..9539eecf0ec 100644 --- a/compiler/testData/ir/irText/classes/objectLiteralExpressions.kt +++ b/compiler/testData/ir/irText/classes/objectLiteralExpressions.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: ANY // WITH_RUNTIME interface IFoo { diff --git a/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.fir.txt b/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.fir.txt index abadb4ef7bd..10e0ddac81a 100644 --- a/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.fir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.fir.txt @@ -34,23 +34,23 @@ FILE fqName: fileName:/enumEntriesWithAnnotations.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:TestEnum modality:FINAL visibility:public superTypes:[kotlin.Enum<.TestEnum>]' ENUM_ENTRY name:ENTRY1 - class: CLASS ENUM_ENTRY name:ENTRY1 modality:FINAL visibility:local superTypes:[.TestEnum] + class: CLASS ENUM_ENTRY name:ENTRY1 modality:FINAL visibility:private superTypes:[.TestEnum] annotations: TestAnn(x = 'ENTRY1') $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestEnum.ENTRY1 CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .TestEnum' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:ENTRY1 modality:FINAL visibility:local superTypes:[.TestEnum]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:ENTRY1 modality:FINAL visibility:private superTypes:[.TestEnum]' ENUM_ENTRY name:ENTRY2 - class: CLASS ENUM_ENTRY name:ENTRY2 modality:FINAL visibility:local superTypes:[.TestEnum] + class: CLASS ENUM_ENTRY name:ENTRY2 modality:FINAL visibility:private superTypes:[.TestEnum] annotations: TestAnn(x = 'ENTRY2') $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestEnum.ENTRY2 CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .TestEnum' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:ENTRY2 modality:FINAL visibility:local superTypes:[.TestEnum]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:ENTRY2 modality:FINAL visibility:private superTypes:[.TestEnum]' PROPERTY name:x visibility:public modality:FINAL [val] FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] EXPRESSION_BODY diff --git a/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.kt b/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.kt index 8c8b13410e7..67414e9da2e 100644 --- a/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.kt +++ b/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: ANY annotation class TestAnn(val x: String) enum class TestEnum { diff --git a/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.fir.txt b/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.fir.txt index 65a0a5bc90f..43360bbe2e6 100644 --- a/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.fir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.fir.txt @@ -6,33 +6,33 @@ FILE fqName: fileName:/enumsInAnnotationArguments.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:En modality:FINAL visibility:public superTypes:[kotlin.Enum<.En>]' ENUM_ENTRY name:A - class: CLASS ENUM_ENTRY name:A modality:FINAL visibility:local superTypes:[.En] + class: CLASS ENUM_ENTRY name:A modality:FINAL visibility:private superTypes:[.En] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.En.A CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .En' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:A modality:FINAL visibility:local superTypes:[.En]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:A modality:FINAL visibility:private superTypes:[.En]' ENUM_ENTRY name:B - class: CLASS ENUM_ENTRY name:B modality:FINAL visibility:local superTypes:[.En] + class: CLASS ENUM_ENTRY name:B modality:FINAL visibility:private superTypes:[.En] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.En.B CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .En' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:B modality:FINAL visibility:local superTypes:[.En]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:B modality:FINAL visibility:private superTypes:[.En]' ENUM_ENTRY name:C - class: CLASS ENUM_ENTRY name:C modality:FINAL visibility:local superTypes:[.En] + class: CLASS ENUM_ENTRY name:C modality:FINAL visibility:private superTypes:[.En] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.En.C CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .En' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:C modality:FINAL visibility:local superTypes:[.En]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:C modality:FINAL visibility:private superTypes:[.En]' ENUM_ENTRY name:D - class: CLASS ENUM_ENTRY name:D modality:FINAL visibility:local superTypes:[.En] + class: CLASS ENUM_ENTRY name:D modality:FINAL visibility:private superTypes:[.En] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.En.D CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .En' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:D modality:FINAL visibility:local superTypes:[.En]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:D modality:FINAL visibility:private superTypes:[.En]' FUN name:values visibility:public modality:FINAL <> ($this:.En) returnType:kotlin.Array<.En> $this: VALUE_PARAMETER name: type:.En BLOCK_BODY diff --git a/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.kt b/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.kt index ceaa064b036..15e2c12e605 100644 --- a/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.kt +++ b/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: ANY enum class En { A, B, C, D } annotation class TestAnn(val x: En) diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.fir.txt b/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.fir.txt index 67183db6513..bb906e9db61 100644 --- a/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.fir.txt +++ b/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.fir.txt @@ -6,19 +6,19 @@ FILE fqName: fileName:/expectedEnumClass.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:MyEnum modality:FINAL visibility:public [expect] superTypes:[kotlin.Enum<.MyEnum>]' ENUM_ENTRY name:FOO - class: CLASS ENUM_ENTRY name:FOO modality:FINAL visibility:local superTypes:[.MyEnum] + class: CLASS ENUM_ENTRY name:FOO modality:FINAL visibility:private superTypes:[.MyEnum] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.MyEnum.FOO CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .MyEnum' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:FOO modality:FINAL visibility:local superTypes:[.MyEnum]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:FOO modality:FINAL visibility:private superTypes:[.MyEnum]' ENUM_ENTRY name:BAR - class: CLASS ENUM_ENTRY name:BAR modality:FINAL visibility:local superTypes:[.MyEnum] + class: CLASS ENUM_ENTRY name:BAR modality:FINAL visibility:private superTypes:[.MyEnum] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.MyEnum.BAR CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .MyEnum' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:BAR modality:FINAL visibility:local superTypes:[.MyEnum]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:BAR modality:FINAL visibility:private superTypes:[.MyEnum]' FUN name:values visibility:public modality:FINAL <> ($this:.MyEnum) returnType:kotlin.Array<.MyEnum> $this: VALUE_PARAMETER name: type:.MyEnum BLOCK_BODY @@ -67,26 +67,26 @@ FILE fqName: fileName:/expectedEnumClass.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:MyEnum modality:FINAL visibility:public superTypes:[kotlin.Enum<.MyEnum>]' ENUM_ENTRY name:FOO - class: CLASS ENUM_ENTRY name:FOO modality:FINAL visibility:local superTypes:[.MyEnum] + class: CLASS ENUM_ENTRY name:FOO modality:FINAL visibility:private superTypes:[.MyEnum] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.MyEnum.FOO CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .MyEnum' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:FOO modality:FINAL visibility:local superTypes:[.MyEnum]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:FOO modality:FINAL visibility:private superTypes:[.MyEnum]' ENUM_ENTRY name:BAR - class: CLASS ENUM_ENTRY name:BAR modality:FINAL visibility:local superTypes:[.MyEnum] + class: CLASS ENUM_ENTRY name:BAR modality:FINAL visibility:private superTypes:[.MyEnum] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.MyEnum.BAR CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .MyEnum' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:BAR modality:FINAL visibility:local superTypes:[.MyEnum]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:BAR modality:FINAL visibility:private superTypes:[.MyEnum]' ENUM_ENTRY name:BAZ - class: CLASS ENUM_ENTRY name:BAZ modality:FINAL visibility:local superTypes:[.MyEnum] + class: CLASS ENUM_ENTRY name:BAZ modality:FINAL visibility:private superTypes:[.MyEnum] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.MyEnum.BAZ CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .MyEnum' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:BAZ modality:FINAL visibility:local superTypes:[.MyEnum]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:BAZ modality:FINAL visibility:private superTypes:[.MyEnum]' FUN name:values visibility:public modality:FINAL <> ($this:.MyEnum) returnType:kotlin.Array<.MyEnum> $this: VALUE_PARAMETER name: type:.MyEnum BLOCK_BODY diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.kt b/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.kt index a5e88fa95c4..d5453638655 100644 --- a/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.kt +++ b/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.kt @@ -1,5 +1,4 @@ // !LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_FIR: ANY expect enum class MyEnum { FOO, diff --git a/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.fir.txt b/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.fir.txt index 4c82aeb938b..20f86081b7a 100644 --- a/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.fir.txt +++ b/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.fir.txt @@ -6,12 +6,12 @@ FILE fqName: fileName:/enumEntryAsReceiver.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:X modality:FINAL visibility:public superTypes:[kotlin.Enum<.X>]' ENUM_ENTRY name:B - class: CLASS ENUM_ENTRY name:B modality:FINAL visibility:local superTypes:[.X] + class: CLASS ENUM_ENTRY name:B modality:FINAL visibility:private superTypes:[.X] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.X.B CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .X' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:B modality:FINAL visibility:local superTypes:[.X]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:B modality:FINAL visibility:private superTypes:[.X]' PROPERTY name:value2 visibility:public modality:FINAL [val] FIELD PROPERTY_BACKING_FIELD name:value2 type:kotlin.String visibility:private [final] EXPRESSION_BODY diff --git a/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.kt b/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.kt index c7032c97410..096316ed24b 100644 --- a/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.kt +++ b/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: ANY enum class X { B { diff --git a/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.fir.txt b/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.fir.txt index 0adb4c38ee7..d6873ffb43b 100644 --- a/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.fir.txt +++ b/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.fir.txt @@ -6,12 +6,12 @@ FILE fqName: fileName:/enumEntryReferenceFromEnumEntryClass.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:MyEnum modality:FINAL visibility:public superTypes:[kotlin.Enum<.MyEnum>]' ENUM_ENTRY name:Z - class: CLASS ENUM_ENTRY name:Z modality:FINAL visibility:local superTypes:[.MyEnum] + class: CLASS ENUM_ENTRY name:Z modality:FINAL visibility:private superTypes:[.MyEnum] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.MyEnum.Z CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .MyEnum' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:Z modality:FINAL visibility:local superTypes:[.MyEnum]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:Z modality:FINAL visibility:private superTypes:[.MyEnum]' PROPERTY name:counter visibility:public modality:FINAL [var] FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:private EXPRESSION_BODY diff --git a/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.kt b/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.kt index a887044fede..95636298feb 100644 --- a/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.kt +++ b/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: ANY enum class MyEnum { Z { var counter = 0 diff --git a/compiler/testData/ir/irText/expressions/funInterface/partialSam.kt b/compiler/testData/ir/irText/expressions/funInterface/partialSam.kt index 14a3f01c651..9050b87fc45 100644 --- a/compiler/testData/ir/irText/expressions/funInterface/partialSam.kt +++ b/compiler/testData/ir/irText/expressions/funInterface/partialSam.kt @@ -1,5 +1,4 @@ // !LANGUAGE: +NewInference +FunctionalInterfaceConversion +SamConversionPerArgument +SamConversionForKotlinFunctions -// IGNORE_BACKEND_FIR: ANY // TARGET_BACKEND: JVM // IGNORE_BACKEND: JVM_IR // IGNORE_BACKEND_FIR: JVM_IR diff --git a/compiler/testData/ir/irText/expressions/multipleThisReferences.kt b/compiler/testData/ir/irText/expressions/multipleThisReferences.kt index 4fb00276dc3..70b0fbeb3bb 100644 --- a/compiler/testData/ir/irText/expressions/multipleThisReferences.kt +++ b/compiler/testData/ir/irText/expressions/multipleThisReferences.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: ANY class Outer { open inner class Inner(val x: Int) } diff --git a/compiler/testData/ir/irText/expressions/objectAsCallable.fir.txt b/compiler/testData/ir/irText/expressions/objectAsCallable.fir.txt index 2a364577aab..9874844b6c5 100644 --- a/compiler/testData/ir/irText/expressions/objectAsCallable.fir.txt +++ b/compiler/testData/ir/irText/expressions/objectAsCallable.fir.txt @@ -25,12 +25,12 @@ FILE fqName: fileName:/objectAsCallable.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:En modality:FINAL visibility:public superTypes:[kotlin.Enum<.En>]' ENUM_ENTRY name:X - class: CLASS ENUM_ENTRY name:X modality:FINAL visibility:local superTypes:[.En] + class: CLASS ENUM_ENTRY name:X modality:FINAL visibility:private superTypes:[.En] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.En.X CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .En' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:X modality:FINAL visibility:local superTypes:[.En]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:X modality:FINAL visibility:private superTypes:[.En]' FUN name:values visibility:public modality:FINAL <> ($this:.En) returnType:kotlin.Array<.En> $this: VALUE_PARAMETER name: type:.En BLOCK_BODY diff --git a/compiler/testData/ir/irText/expressions/objectAsCallable.kt b/compiler/testData/ir/irText/expressions/objectAsCallable.kt index 97121e1cc69..59b940d54a0 100644 --- a/compiler/testData/ir/irText/expressions/objectAsCallable.kt +++ b/compiler/testData/ir/irText/expressions/objectAsCallable.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: ANY object A enum class En { X } diff --git a/compiler/testData/ir/irText/expressions/objectReference.kt b/compiler/testData/ir/irText/expressions/objectReference.kt index ace16bc9669..43b651d8520 100644 --- a/compiler/testData/ir/irText/expressions/objectReference.kt +++ b/compiler/testData/ir/irText/expressions/objectReference.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: ANY object Z { var counter = 0 fun foo() {} diff --git a/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.fir.txt b/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.fir.txt index 7915162bcc7..cbd9bc26899 100644 --- a/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.fir.txt +++ b/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.fir.txt @@ -27,14 +27,14 @@ FILE fqName: fileName:/temporaryInEnumEntryInitializer.kt GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String? visibility:private [final]' type=kotlin.String? origin=null receiver: GET_VAR ': .En declared in .En.' type=.En origin=null ENUM_ENTRY name:ENTRY - class: CLASS ENUM_ENTRY name:ENTRY modality:FINAL visibility:local superTypes:[.En] + class: CLASS ENUM_ENTRY name:ENTRY modality:FINAL visibility:private superTypes:[.En] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.En.ENTRY CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor (x: kotlin.String?) [primary] declared in .En' x: CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String? origin=null $this: CALL 'public final fun (): kotlin.Any? declared in ' type=kotlin.Any? origin=null - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:ENTRY modality:FINAL visibility:local superTypes:[.En]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:ENTRY modality:FINAL visibility:private superTypes:[.En]' FUN name:values visibility:public modality:FINAL <> ($this:.En) returnType:kotlin.Array<.En> $this: VALUE_PARAMETER name: type:.En BLOCK_BODY diff --git a/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.kt b/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.kt index 36a6c44229f..fa7a3f687c6 100644 --- a/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.kt +++ b/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: ANY val n: Any? = null enum class En(val x: String?) { diff --git a/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.kt b/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.kt index 98e8b987835..2352d9a001c 100644 --- a/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.kt +++ b/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: ANY class Outer(val x: T) { open inner class Inner(val y: Int) } diff --git a/compiler/testData/ir/irText/expressions/thisReferenceBeforeClassDeclared.kt b/compiler/testData/ir/irText/expressions/thisReferenceBeforeClassDeclared.kt index fac2f3d89bd..9ecd279c30f 100644 --- a/compiler/testData/ir/irText/expressions/thisReferenceBeforeClassDeclared.kt +++ b/compiler/testData/ir/irText/expressions/thisReferenceBeforeClassDeclared.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: ANY fun WithCompanion.test() { val test1 = object : WithCompanion(this) {} val test2 = object : WithCompanion(this.foo()) {} diff --git a/compiler/testData/ir/irText/expressions/values.fir.txt b/compiler/testData/ir/irText/expressions/values.fir.txt index 9e742d719cb..fb82d33325f 100644 --- a/compiler/testData/ir/irText/expressions/values.fir.txt +++ b/compiler/testData/ir/irText/expressions/values.fir.txt @@ -6,12 +6,12 @@ FILE fqName: fileName:/values.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:Enum modality:FINAL visibility:public superTypes:[kotlin.Enum<.Enum>]' ENUM_ENTRY name:A - class: CLASS ENUM_ENTRY name:A modality:FINAL visibility:local superTypes:[.Enum] + class: CLASS ENUM_ENTRY name:A modality:FINAL visibility:private superTypes:[.Enum] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Enum.A CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .Enum' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:A modality:FINAL visibility:local superTypes:[.Enum]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:A modality:FINAL visibility:private superTypes:[.Enum]' FUN name:values visibility:public modality:FINAL <> ($this:.Enum) returnType:kotlin.Array<.Enum> $this: VALUE_PARAMETER name: type:.Enum BLOCK_BODY diff --git a/compiler/testData/ir/irText/expressions/values.kt b/compiler/testData/ir/irText/expressions/values.kt index 4c926b8f758..949b7b1d277 100644 --- a/compiler/testData/ir/irText/expressions/values.kt +++ b/compiler/testData/ir/irText/expressions/values.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: ANY enum class Enum { A } object A val a = 0 diff --git a/compiler/testData/ir/irText/singletons/enumEntry.fir.txt b/compiler/testData/ir/irText/singletons/enumEntry.fir.txt index 7fe12f2b73b..5f49a68782d 100644 --- a/compiler/testData/ir/irText/singletons/enumEntry.fir.txt +++ b/compiler/testData/ir/irText/singletons/enumEntry.fir.txt @@ -6,12 +6,12 @@ FILE fqName: fileName:/enumEntry.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:Z modality:FINAL visibility:public superTypes:[kotlin.Enum<.Z>]' ENUM_ENTRY name:ENTRY - class: CLASS ENUM_ENTRY name:ENTRY modality:FINAL visibility:local superTypes:[.Z] + class: CLASS ENUM_ENTRY name:ENTRY modality:FINAL visibility:private superTypes:[.Z] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Z.ENTRY CONSTRUCTOR visibility:private <> () returnType:. [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .Z' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:ENTRY modality:FINAL visibility:local superTypes:[.Z]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:ENTRY modality:FINAL visibility:private superTypes:[.Z]' FUN name:test visibility:public modality:FINAL <> ($this:.Z.ENTRY) returnType:kotlin.Unit $this: VALUE_PARAMETER name: type:.Z.ENTRY BLOCK_BODY diff --git a/compiler/testData/ir/irText/singletons/enumEntry.kt b/compiler/testData/ir/irText/singletons/enumEntry.kt index 9abd4c451aa..b79d0cd9615 100644 --- a/compiler/testData/ir/irText/singletons/enumEntry.kt +++ b/compiler/testData/ir/irText/singletons/enumEntry.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: ANY enum class Z { ENTRY { fun test() {}