fixup! fixup! FIR2IR: convert enums with non-primary default ctor correctly
diff --git a/compiler/testData/ir/irText/classes/classMembers.ir.txt b/compiler/testData/ir/irText/classes/classMembers.ir.txt
index 0d3f148..3a6d20f 100644
--- a/compiler/testData/ir/irText/classes/classMembers.ir.txt
+++ b/compiler/testData/ir/irText/classes/classMembers.ir.txt
@@ -10,12 +10,6 @@
BLOCK_BODY
DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C modality:FINAL visibility:public superTypes:[kotlin.Any]'
- CONSTRUCTOR visibility:public <> () returnType:<root>.C
- BLOCK_BODY
- DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> (x: kotlin.Int, y: kotlin.Int, z: kotlin.Int) [primary] declared in <root>.C'
- x: CONST Int type=kotlin.Int value=0
- y: CONST Int type=kotlin.Int value=0
- z: CONST Int type=kotlin.Int value=0
PROPERTY name:y visibility:public modality:FINAL [val]
FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private [final]
EXPRESSION_BODY
@@ -46,6 +40,12 @@
SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:z type:kotlin.Int visibility:private' type=kotlin.Unit origin=null
receiver: GET_VAR '<this>: <root>.C declared in <root>.C.<set-z>' type=<root>.C origin=null
value: GET_VAR '<set-?>: kotlin.Int declared in <root>.C.<set-z>' type=kotlin.Int origin=null
+ CONSTRUCTOR visibility:public <> () returnType:<root>.C
+ BLOCK_BODY
+ DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> (x: kotlin.Int, y: kotlin.Int, z: kotlin.Int) [primary] declared in <root>.C'
+ x: CONST Int type=kotlin.Int value=0
+ y: CONST Int type=kotlin.Int value=0
+ z: CONST Int type=kotlin.Int value=0
PROPERTY name:property visibility:public modality:FINAL [val]
FIELD PROPERTY_BACKING_FIELD name:property type:kotlin.Int visibility:private [final]
EXPRESSION_BODY
diff --git a/compiler/testData/ir/irText/classes/classMembers.kt.txt b/compiler/testData/ir/irText/classes/classMembers.kt.txt
index cebb0ed..96d4d71 100644
--- a/compiler/testData/ir/irText/classes/classMembers.kt.txt
+++ b/compiler/testData/ir/irText/classes/classMembers.kt.txt
@@ -5,10 +5,6 @@
}
- constructor() {
- this/*C*/(x = 0, y = 0, z = 0)
- }
-
val y: Int
field = y
get
@@ -18,6 +14,10 @@
get
set
+ constructor() {
+ this/*C*/(x = 0, y = 0, z = 0)
+ }
+
val property: Int
field = 0
get
diff --git a/compiler/testData/ir/irText/classes/initBlock.ir.txt b/compiler/testData/ir/irText/classes/initBlock.ir.txt
index d09c0c4..de0415d 100644
--- a/compiler/testData/ir/irText/classes/initBlock.ir.txt
+++ b/compiler/testData/ir/irText/classes/initBlock.ir.txt
@@ -57,13 +57,13 @@
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
CLASS CLASS name:Test3 modality:FINAL visibility:public superTypes:[kotlin.Any]
$this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test3
+ ANONYMOUS_INITIALIZER isStatic=false
+ BLOCK_BODY
+ CALL 'public final fun println (): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null
CONSTRUCTOR visibility:public <> () returnType:<root>.Test3
BLOCK_BODY
DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test3 modality:FINAL visibility:public superTypes:[kotlin.Any]'
- ANONYMOUS_INITIALIZER isStatic=false
- BLOCK_BODY
- CALL 'public final fun println (): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit 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 [operator] declared in kotlin.Any
@@ -79,14 +79,14 @@
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
CLASS CLASS name:Test4 modality:FINAL visibility:public superTypes:[kotlin.Any]
$this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test4
- CONSTRUCTOR visibility:public <> () returnType:<root>.Test4
- BLOCK_BODY
- DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
- INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test4 modality:FINAL visibility:public superTypes:[kotlin.Any]'
ANONYMOUS_INITIALIZER isStatic=false
BLOCK_BODY
CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null
message: CONST String type=kotlin.String value="1"
+ CONSTRUCTOR visibility:public <> () returnType:<root>.Test4
+ BLOCK_BODY
+ DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+ INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test4 modality:FINAL visibility:public superTypes:[kotlin.Any]'
ANONYMOUS_INITIALIZER isStatic=false
BLOCK_BODY
CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null
diff --git a/compiler/testData/ir/irText/classes/initBlock.kt.txt b/compiler/testData/ir/irText/classes/initBlock.kt.txt
index ae28935..2e1a89d 100644
--- a/compiler/testData/ir/irText/classes/initBlock.kt.txt
+++ b/compiler/testData/ir/irText/classes/initBlock.kt.txt
@@ -29,19 +29,23 @@
}
class Test3 {
+ init {
+ println()
+ }
+
constructor() {
super/*Any*/()
/* <init>() */
}
- init {
- println()
- }
-
}
class Test4 {
+ init {
+ println(message = "1")
+ }
+
constructor() {
super/*Any*/()
/* <init>() */
@@ -49,10 +53,6 @@
}
init {
- println(message = "1")
- }
-
- init {
println(message = "2")
}
diff --git a/compiler/testData/ir/irText/classes/initVar.ir.txt b/compiler/testData/ir/irText/classes/initVar.ir.txt
index 4b4c729..aa0c276 100644
--- a/compiler/testData/ir/irText/classes/initVar.ir.txt
+++ b/compiler/testData/ir/irText/classes/initVar.ir.txt
@@ -157,10 +157,6 @@
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
CLASS CLASS name:TestInitVarWithCustomSetterWithExplicitCtor modality:FINAL visibility:public superTypes:[kotlin.Any]
$this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestInitVarWithCustomSetterWithExplicitCtor
- CONSTRUCTOR visibility:public <> () returnType:<root>.TestInitVarWithCustomSetterWithExplicitCtor
- BLOCK_BODY
- DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
- INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestInitVarWithCustomSetterWithExplicitCtor modality:FINAL visibility:public superTypes:[kotlin.Any]'
PROPERTY name:x visibility:public modality:FINAL [var]
FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:<root>.TestInitVarWithCustomSetterWithExplicitCtor) returnType:kotlin.Int
@@ -183,6 +179,10 @@
CALL 'public final fun <set-x> (value: kotlin.Int): kotlin.Unit declared in <root>.TestInitVarWithCustomSetterWithExplicitCtor' type=kotlin.Unit origin=EQ
$this: GET_VAR '<this>: <root>.TestInitVarWithCustomSetterWithExplicitCtor declared in <root>.TestInitVarWithCustomSetterWithExplicitCtor' type=<root>.TestInitVarWithCustomSetterWithExplicitCtor origin=null
value: CONST Int type=kotlin.Int value=0
+ CONSTRUCTOR visibility:public <> () returnType:<root>.TestInitVarWithCustomSetterWithExplicitCtor
+ BLOCK_BODY
+ DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+ INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestInitVarWithCustomSetterWithExplicitCtor modality:FINAL visibility:public superTypes:[kotlin.Any]'
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 [operator] declared in kotlin.Any
@@ -198,13 +198,6 @@
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
CLASS CLASS name:TestInitVarWithCustomSetterInCtor modality:FINAL visibility:public superTypes:[kotlin.Any]
$this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestInitVarWithCustomSetterInCtor
- CONSTRUCTOR visibility:public <> () returnType:<root>.TestInitVarWithCustomSetterInCtor
- BLOCK_BODY
- DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
- INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestInitVarWithCustomSetterInCtor modality:FINAL visibility:public superTypes:[kotlin.Any]'
- CALL 'public final fun <set-x> (value: kotlin.Int): kotlin.Unit declared in <root>.TestInitVarWithCustomSetterInCtor' type=kotlin.Unit origin=EQ
- $this: GET_VAR '<this>: <root>.TestInitVarWithCustomSetterInCtor declared in <root>.TestInitVarWithCustomSetterInCtor' type=<root>.TestInitVarWithCustomSetterInCtor origin=null
- value: CONST Int type=kotlin.Int value=42
PROPERTY name:x visibility:public modality:FINAL [var]
FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:<root>.TestInitVarWithCustomSetterInCtor) returnType:kotlin.Int
@@ -222,6 +215,13 @@
SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private' type=kotlin.Unit origin=EQ
receiver: GET_VAR '<this>: <root>.TestInitVarWithCustomSetterInCtor declared in <root>.TestInitVarWithCustomSetterInCtor.<set-x>' type=<root>.TestInitVarWithCustomSetterInCtor origin=null
value: GET_VAR 'value: kotlin.Int declared in <root>.TestInitVarWithCustomSetterInCtor.<set-x>' type=kotlin.Int origin=null
+ CONSTRUCTOR visibility:public <> () returnType:<root>.TestInitVarWithCustomSetterInCtor
+ BLOCK_BODY
+ DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+ INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestInitVarWithCustomSetterInCtor modality:FINAL visibility:public superTypes:[kotlin.Any]'
+ CALL 'public final fun <set-x> (value: kotlin.Int): kotlin.Unit declared in <root>.TestInitVarWithCustomSetterInCtor' type=kotlin.Unit origin=EQ
+ $this: GET_VAR '<this>: <root>.TestInitVarWithCustomSetterInCtor declared in <root>.TestInitVarWithCustomSetterInCtor' type=<root>.TestInitVarWithCustomSetterInCtor origin=null
+ value: CONST Int type=kotlin.Int value=42
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 [operator] declared in kotlin.Any
diff --git a/compiler/testData/ir/irText/classes/initVar.kt.txt b/compiler/testData/ir/irText/classes/initVar.kt.txt
index c4aa5b4..0dfe1c6 100644
--- a/compiler/testData/ir/irText/classes/initVar.kt.txt
+++ b/compiler/testData/ir/irText/classes/initVar.kt.txt
@@ -60,12 +60,6 @@
}
class TestInitVarWithCustomSetterWithExplicitCtor {
- constructor() {
- super/*Any*/()
- /* <init>() */
-
- }
-
var x: Int
get
set(value: Int) {
@@ -76,9 +70,21 @@
<this>.<set-x>(value = 0)
}
+ constructor() {
+ super/*Any*/()
+ /* <init>() */
+
+ }
+
}
class TestInitVarWithCustomSetterInCtor {
+ var x: Int
+ get
+ set(value: Int) {
+ <this>.#x = value
+ }
+
constructor() {
super/*Any*/()
/* <init>() */
@@ -86,11 +92,5 @@
<this>.<set-x>(value = 42)
}
- var x: Int
- get
- set(value: Int) {
- <this>.#x = value
- }
-
}
diff --git a/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.ir.txt b/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.ir.txt
index 84ecbdb..3345530 100644
--- a/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.ir.txt
+++ b/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.ir.txt
@@ -64,12 +64,6 @@
BLOCK_BODY
DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.Base'
INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestWithDelegatingConstructor modality:FINAL visibility:public superTypes:[<root>.Base]'
- CONSTRUCTOR visibility:public <> (x:kotlin.Int) returnType:<root>.TestWithDelegatingConstructor
- VALUE_PARAMETER name:x index:0 type:kotlin.Int
- BLOCK_BODY
- DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> (x: kotlin.Int, y: kotlin.Int) [primary] declared in <root>.TestWithDelegatingConstructor'
- x: GET_VAR 'x: kotlin.Int declared in <root>.TestWithDelegatingConstructor.<init>' type=kotlin.Int origin=null
- y: CONST Int type=kotlin.Int value=0
PROPERTY name:x visibility:public modality:FINAL [val]
FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]
EXPRESSION_BODY
@@ -92,6 +86,12 @@
RETURN type=kotlin.Nothing from='public final fun <get-y> (): kotlin.Int declared in <root>.TestWithDelegatingConstructor'
GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null
receiver: GET_VAR '<this>: <root>.TestWithDelegatingConstructor declared in <root>.TestWithDelegatingConstructor.<get-y>' type=<root>.TestWithDelegatingConstructor origin=null
+ CONSTRUCTOR visibility:public <> (x:kotlin.Int) returnType:<root>.TestWithDelegatingConstructor
+ VALUE_PARAMETER name:x index:0 type:kotlin.Int
+ BLOCK_BODY
+ DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> (x: kotlin.Int, y: kotlin.Int) [primary] declared in <root>.TestWithDelegatingConstructor'
+ x: GET_VAR 'x: kotlin.Int declared in <root>.TestWithDelegatingConstructor.<init>' type=kotlin.Int origin=null
+ y: CONST Int type=kotlin.Int value=0
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 <root>.Base
diff --git a/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.kt.txt b/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.kt.txt
index cb9beff..52ff9ed 100644
--- a/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.kt.txt
+++ b/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.kt.txt
@@ -32,10 +32,6 @@
}
- constructor(x: Int) {
- this/*TestWithDelegatingConstructor*/(x = x, y = 0)
- }
-
val x: Int
field = x
get
@@ -44,5 +40,9 @@
field = y
get
+ constructor(x: Int) {
+ this/*TestWithDelegatingConstructor*/(x = x, y = 0)
+ }
+
}
diff --git a/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.ir.txt b/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.ir.txt
index 1aa7ca0..8623cc0 100644
--- a/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.ir.txt
+++ b/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.ir.txt
@@ -20,10 +20,6 @@
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
CLASS CLASS name:TestProperty modality:FINAL visibility:public superTypes:[<root>.Base]
$this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestProperty
- CONSTRUCTOR visibility:public <> () returnType:<root>.TestProperty
- BLOCK_BODY
- DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.Base'
- INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestProperty modality:FINAL visibility:public superTypes:[<root>.Base]'
PROPERTY name:x visibility:public modality:FINAL [val]
FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]
EXPRESSION_BODY
@@ -35,6 +31,10 @@
RETURN type=kotlin.Nothing from='public final fun <get-x> (): kotlin.Int declared in <root>.TestProperty'
GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null
receiver: GET_VAR '<this>: <root>.TestProperty declared in <root>.TestProperty.<get-x>' type=<root>.TestProperty origin=null
+ CONSTRUCTOR visibility:public <> () returnType:<root>.TestProperty
+ BLOCK_BODY
+ DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.Base'
+ INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestProperty modality:FINAL visibility:public superTypes:[<root>.Base]'
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 <root>.Base
@@ -50,19 +50,6 @@
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
CLASS CLASS name:TestInitBlock modality:FINAL visibility:public superTypes:[<root>.Base]
$this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestInitBlock
- CONSTRUCTOR visibility:public <> () returnType:<root>.TestInitBlock
- BLOCK_BODY
- DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.Base'
- INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestInitBlock modality:FINAL visibility:public superTypes:[<root>.Base]'
- CONSTRUCTOR visibility:public <> (z:kotlin.Any) returnType:<root>.TestInitBlock
- VALUE_PARAMETER name:z index:0 type:kotlin.Any
- BLOCK_BODY
- DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.Base'
- INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestInitBlock modality:FINAL visibility:public superTypes:[<root>.Base]'
- CONSTRUCTOR visibility:public <> (y:kotlin.Int) returnType:<root>.TestInitBlock
- VALUE_PARAMETER name:y index:0 type:kotlin.Int
- BLOCK_BODY
- DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.TestInitBlock'
PROPERTY name:x visibility:public modality:FINAL [val]
FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:<root>.TestInitBlock) returnType:kotlin.Int
@@ -77,6 +64,19 @@
SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Unit origin=null
receiver: GET_VAR '<this>: <root>.TestInitBlock declared in <root>.TestInitBlock' type=<root>.TestInitBlock origin=null
value: CONST Int type=kotlin.Int value=0
+ CONSTRUCTOR visibility:public <> () returnType:<root>.TestInitBlock
+ BLOCK_BODY
+ DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.Base'
+ INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestInitBlock modality:FINAL visibility:public superTypes:[<root>.Base]'
+ CONSTRUCTOR visibility:public <> (z:kotlin.Any) returnType:<root>.TestInitBlock
+ VALUE_PARAMETER name:z index:0 type:kotlin.Any
+ BLOCK_BODY
+ DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.Base'
+ INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestInitBlock modality:FINAL visibility:public superTypes:[<root>.Base]'
+ CONSTRUCTOR visibility:public <> (y:kotlin.Int) returnType:<root>.TestInitBlock
+ VALUE_PARAMETER name:y index:0 type:kotlin.Int
+ BLOCK_BODY
+ DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.TestInitBlock'
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 <root>.Base
diff --git a/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.kt.txt b/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.kt.txt
index 007005f..48bdc9f 100644
--- a/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.kt.txt
+++ b/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.kt.txt
@@ -8,19 +8,26 @@
}
class TestProperty : Base {
+ val x: Int
+ field = 0
+ get
+
constructor() {
super/*Base*/()
/* <init>() */
}
- val x: Int
- field = 0
- get
-
}
class TestInitBlock : Base {
+ val x: Int
+ get
+
+ init {
+ <this>.#x = 0
+ }
+
constructor() {
super/*Base*/()
/* <init>() */
@@ -37,12 +44,5 @@
this/*TestInitBlock*/()
}
- val x: Int
- get
-
- init {
- <this>.#x = 0
- }
-
}
