diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt index 4266f40494d..8b90d049bb8 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt @@ -265,6 +265,7 @@ class Fir2IrVisitor( convertToIrExpression(initializer).cast(initializer, initializer.typeRef, variable.returnTypeRef) } } + annotationGenerator.generate(irVariable, variable) return irVariable } diff --git a/compiler/testData/ir/irText/declarations/annotations/variablesWithAnnotations.fir.kt.txt b/compiler/testData/ir/irText/declarations/annotations/variablesWithAnnotations.fir.kt.txt deleted file mode 100644 index a9c7989fc4d..00000000000 --- a/compiler/testData/ir/irText/declarations/annotations/variablesWithAnnotations.fir.kt.txt +++ /dev/null @@ -1,12 +0,0 @@ -annotation class TestAnn : Annotation { - constructor(x: String) /* primary */ - val x: String - field = x - get - -} - -fun foo() { - val testVal: String = "testVal" - var testVar: String = "testVar" -} diff --git a/compiler/testData/ir/irText/declarations/annotations/variablesWithAnnotations.fir.txt b/compiler/testData/ir/irText/declarations/annotations/variablesWithAnnotations.fir.txt deleted file mode 100644 index fd3b6a836f1..00000000000 --- a/compiler/testData/ir/irText/declarations/annotations/variablesWithAnnotations.fir.txt +++ /dev/null @@ -1,35 +0,0 @@ -FILE fqName: fileName:/variablesWithAnnotations.kt - CLASS ANNOTATION_CLASS name:TestAnn modality:FINAL visibility:public superTypes:[kotlin.Annotation] - $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestAnn - CONSTRUCTOR visibility:public <> (x:kotlin.String) returnType:.TestAnn [primary] - VALUE_PARAMETER name:x index:0 type:kotlin.String - PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:private [final] - EXPRESSION_BODY - GET_VAR 'x: kotlin.String declared in .TestAnn.' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestAnn) returnType:kotlin.String - correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [val] - $this: VALUE_PARAMETER name: type:.TestAnn - BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in .TestAnn' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:private [final]' type=kotlin.String origin=null - receiver: GET_VAR ': .TestAnn declared in .TestAnn.' type=.TestAnn 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 - $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 - $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 - $this: VALUE_PARAMETER name: type:kotlin.Any - FUN name:foo visibility:public modality:FINAL <> () returnType:kotlin.Unit - BLOCK_BODY - VAR name:testVal type:kotlin.String [val] - CONST String type=kotlin.String value="testVal" - VAR name:testVar type:kotlin.String [var] - CONST String type=kotlin.String value="testVar" diff --git a/compiler/testData/ir/irText/declarations/annotations/variablesWithAnnotations.kt b/compiler/testData/ir/irText/declarations/annotations/variablesWithAnnotations.kt index 79507bb1d90..4d4375b66fb 100644 --- a/compiler/testData/ir/irText/declarations/annotations/variablesWithAnnotations.kt +++ b/compiler/testData/ir/irText/declarations/annotations/variablesWithAnnotations.kt @@ -1,3 +1,5 @@ +// FIR_IDENTICAL + annotation class TestAnn(val x: String) fun foo() {