Fix fir2ir text tests after introducing const evaluator

compiler/testData/ir/irText/declarations/constValInitializers.fir.txt

@@ -1,76 +0,0 @@
-FILE fqName:<root> fileName:/constValInitializers.kt
-  PROPERTY name:I0 visibility:public modality:FINAL [const,val]
-    FIELD PROPERTY_BACKING_FIELD name:I0 type:kotlin.Int visibility:public [final,static]
-      EXPRESSION_BODY
-        CONST Int type=kotlin.Int value=0
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-I0> visibility:public modality:FINAL <> () returnType:kotlin.Int
-      correspondingProperty: PROPERTY name:I0 visibility:public modality:FINAL [const,val]
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-I0> (): kotlin.Int declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:I0 type:kotlin.Int visibility:public [final,static]' type=kotlin.Int origin=null
-  PROPERTY name:I1 visibility:public modality:FINAL [const,val]
-    FIELD PROPERTY_BACKING_FIELD name:I1 type:kotlin.Int visibility:public [final,static]
-      EXPRESSION_BODY
-        CONST Int type=kotlin.Int value=1
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-I1> visibility:public modality:FINAL <> () returnType:kotlin.Int
-      correspondingProperty: PROPERTY name:I1 visibility:public modality:FINAL [const,val]
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-I1> (): kotlin.Int declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:I1 type:kotlin.Int visibility:public [final,static]' type=kotlin.Int origin=null
-  PROPERTY name:I2 visibility:public modality:FINAL [const,val]
-    FIELD PROPERTY_BACKING_FIELD name:I2 type:kotlin.Int visibility:public [final,static]
-      EXPRESSION_BODY
-        CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=PLUS
-          $this: CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=PLUS
-            $this: CALL 'public final fun <get-I0> (): kotlin.Int declared in <root>' type=kotlin.Int origin=GET_PROPERTY
-            other: CALL 'public final fun <get-I1> (): kotlin.Int declared in <root>' type=kotlin.Int origin=GET_PROPERTY
-          other: CALL 'public final fun <get-I1> (): kotlin.Int declared in <root>' type=kotlin.Int origin=GET_PROPERTY
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-I2> visibility:public modality:FINAL <> () returnType:kotlin.Int
-      correspondingProperty: PROPERTY name:I2 visibility:public modality:FINAL [const,val]
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-I2> (): kotlin.Int declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:I2 type:kotlin.Int visibility:public [final,static]' type=kotlin.Int origin=null
-  PROPERTY name:STR1 visibility:public modality:FINAL [const,val]
-    FIELD PROPERTY_BACKING_FIELD name:STR1 type:kotlin.String visibility:public [final,static]
-      EXPRESSION_BODY
-        CONST String type=kotlin.String value="String1"
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-STR1> visibility:public modality:FINAL <> () returnType:kotlin.String
-      correspondingProperty: PROPERTY name:STR1 visibility:public modality:FINAL [const,val]
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-STR1> (): kotlin.String declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:STR1 type:kotlin.String visibility:public [final,static]' type=kotlin.String origin=null
-  PROPERTY name:STR2 visibility:public modality:FINAL [const,val]
-    FIELD PROPERTY_BACKING_FIELD name:STR2 type:kotlin.String visibility:public [final,static]
-      EXPRESSION_BODY
-        CALL 'public final fun plus (other: kotlin.Any?): kotlin.String [operator] declared in kotlin.String' type=kotlin.String origin=PLUS
-          $this: CONST String type=kotlin.String value="String"
-          other: CONST String type=kotlin.String value="2"
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-STR2> visibility:public modality:FINAL <> () returnType:kotlin.String
-      correspondingProperty: PROPERTY name:STR2 visibility:public modality:FINAL [const,val]
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-STR2> (): kotlin.String declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:STR2 type:kotlin.String visibility:public [final,static]' type=kotlin.String origin=null
-  PROPERTY name:STR3 visibility:public modality:FINAL [const,val]
-    FIELD PROPERTY_BACKING_FIELD name:STR3 type:kotlin.String visibility:public [final,static]
-      EXPRESSION_BODY
-        CALL 'public final fun plus (other: kotlin.Any?): kotlin.String [operator] declared in kotlin.String' type=kotlin.String origin=PLUS
-          $this: CALL 'public final fun <get-STR1> (): kotlin.String declared in <root>' type=kotlin.String origin=GET_PROPERTY
-          other: CALL 'public final fun <get-STR2> (): kotlin.String declared in <root>' type=kotlin.String origin=GET_PROPERTY
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-STR3> visibility:public modality:FINAL <> () returnType:kotlin.String
-      correspondingProperty: PROPERTY name:STR3 visibility:public modality:FINAL [const,val]
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-STR3> (): kotlin.String declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:STR3 type:kotlin.String visibility:public [final,static]' type=kotlin.String origin=null
-  PROPERTY name:STR4 visibility:public modality:FINAL [const,val]
-    FIELD PROPERTY_BACKING_FIELD name:STR4 type:kotlin.String visibility:public [final,static]
-      EXPRESSION_BODY
-        STRING_CONCATENATION type=kotlin.String
-          CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null
-            $this: CALL 'public final fun <get-STR1> (): kotlin.String declared in <root>' type=kotlin.String origin=GET_PROPERTY
-          CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null
-            $this: CALL 'public final fun <get-STR2> (): kotlin.String declared in <root>' type=kotlin.String origin=GET_PROPERTY
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-STR4> visibility:public modality:FINAL <> () returnType:kotlin.String
-      correspondingProperty: PROPERTY name:STR4 visibility:public modality:FINAL [const,val]
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-STR4> (): kotlin.String declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:STR4 type:kotlin.String visibility:public [final,static]' type=kotlin.String origin=null

compiler/testData/ir/irText/declarations/constValInitializers.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 const val I0 = 0
 const val I1 = 1
 const val I2 = I0 + I1 + I1

compiler/testData/ir/irText/expressions/floatingPointComparisons/whenByFloatingPoint.fir.txt

@@ -23,8 +23,7 @@ FILE fqName:<root> fileName:/whenByFloatingPoint.kt
           if: TYPE_OP type=kotlin.Boolean origin=NOT_INSTANCEOF typeOperand=kotlin.Double
             GET_VAR 'x: kotlin.Any declared in <root>.testSmartCastInWhenSubject' type=kotlin.Any origin=null
           then: RETURN type=kotlin.Nothing from='public final fun testSmartCastInWhenSubject (x: kotlin.Any): kotlin.Int declared in <root>'
-            CALL 'public final fun unaryMinus (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null
+            CONST Int type=kotlin.Int value=-1
-              $this: CONST Int type=kotlin.Int value=1
       RETURN type=kotlin.Nothing from='public final fun testSmartCastInWhenSubject (x: kotlin.Any): kotlin.Int declared in <root>'
         BLOCK type=kotlin.Int origin=WHEN
           VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:kotlin.Double [val]
@@ -48,8 +47,7 @@ FILE fqName:<root> fileName:/whenByFloatingPoint.kt
           if: TYPE_OP type=kotlin.Boolean origin=NOT_INSTANCEOF typeOperand=kotlin.Double
             GET_VAR 'y: kotlin.Any declared in <root>.testSmartCastInWhenCondition' type=kotlin.Any origin=null
           then: RETURN type=kotlin.Nothing from='public final fun testSmartCastInWhenCondition (x: kotlin.Double, y: kotlin.Any): kotlin.Int declared in <root>'
-            CALL 'public final fun unaryMinus (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null
+            CONST Int type=kotlin.Int value=-1
-              $this: CONST Int type=kotlin.Int value=1
       RETURN type=kotlin.Nothing from='public final fun testSmartCastInWhenCondition (x: kotlin.Double, y: kotlin.Any): kotlin.Int declared in <root>'
         BLOCK type=kotlin.Int origin=WHEN
           VAR IR_TEMPORARY_VARIABLE name:tmp_2 type:kotlin.Double [val]
@@ -75,8 +73,7 @@ FILE fqName:<root> fileName:/whenByFloatingPoint.kt
             BRANCH
               if: TYPE_OP type=kotlin.Boolean origin=NOT_INSTANCEOF typeOperand=kotlin.Double
                 GET_VAR 'val tmp_3: kotlin.Any [val] declared in <root>.testSmartCastInWhenConditionInBranch' type=kotlin.Any origin=null
-              then: CALL 'public final fun unaryMinus (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null
+              then: CONST Int type=kotlin.Int value=-1
-                $this: CONST Int type=kotlin.Int value=1
             BRANCH
               if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
                 arg0: GET_VAR 'val tmp_3: kotlin.Any [val] declared in <root>.testSmartCastInWhenConditionInBranch' type=kotlin.Any origin=null
@@ -94,15 +91,13 @@ FILE fqName:<root> fileName:/whenByFloatingPoint.kt
           if: TYPE_OP type=kotlin.Boolean origin=NOT_INSTANCEOF typeOperand=kotlin.Double
             GET_VAR 'x: kotlin.Any declared in <root>.testSmartCastToDifferentTypes' type=kotlin.Any origin=null
           then: RETURN type=kotlin.Nothing from='public final fun testSmartCastToDifferentTypes (x: kotlin.Any, y: kotlin.Any): kotlin.Int declared in <root>'
-            CALL 'public final fun unaryMinus (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null
+            CONST Int type=kotlin.Int value=-1
-              $this: CONST Int type=kotlin.Int value=1
       WHEN type=kotlin.Unit origin=IF
         BRANCH
           if: TYPE_OP type=kotlin.Boolean origin=NOT_INSTANCEOF typeOperand=kotlin.Float
             GET_VAR 'y: kotlin.Any declared in <root>.testSmartCastToDifferentTypes' type=kotlin.Any origin=null
           then: RETURN type=kotlin.Nothing from='public final fun testSmartCastToDifferentTypes (x: kotlin.Any, y: kotlin.Any): kotlin.Int declared in <root>'
-            CALL 'public final fun unaryMinus (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null
+            CONST Int type=kotlin.Int value=-1
-              $this: CONST Int type=kotlin.Int value=1
       RETURN type=kotlin.Nothing from='public final fun testSmartCastToDifferentTypes (x: kotlin.Any, y: kotlin.Any): kotlin.Int declared in <root>'
         BLOCK type=kotlin.Int origin=WHEN
           VAR IR_TEMPORARY_VARIABLE name:tmp_4 type:kotlin.Double [val]

compiler/testData/ir/irText/expressions/genericConstructorCallWithTypeArguments.fir.txt

@@ -4,9 +4,7 @@ FILE fqName:<root> fileName:/genericConstructorCallWithTypeArguments.kt
       RETURN type=kotlin.Nothing from='public final fun testSimple (): <root>.Box<kotlin.Long> declared in <root>'
         CONSTRUCTOR_CALL 'public constructor <init> (value: T of <root>.Box) [primary] declared in <root>.Box' type=<root>.Box<kotlin.Long> origin=null
           <class: T>: kotlin.Long
-          value: CALL 'public final fun times (other: kotlin.Long): kotlin.Long [operator] declared in kotlin.Long' type=kotlin.Long origin=null
+          value: CONST Long type=kotlin.Long value=6
-            $this: CONST Long type=kotlin.Long value=2
-            other: CONST Long type=kotlin.Long value=3
   FUN name:testArray visibility:public modality:FINAL <T> (n:kotlin.Int, block:kotlin.Function0<T of <root>.testArray>) returnType:kotlin.Array<T of <root>.testArray> [inline]
     TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?]
     VALUE_PARAMETER name:n index:0 type:kotlin.Int

compiler/testData/ir/irText/expressions/ifElseIf.fir.txt

@@ -16,8 +16,7 @@ FILE fqName:<root> fileName:/ifElseIf.kt
                 if: CALL 'public final fun less (arg0: kotlin.Int, arg1: kotlin.Int): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=LT
                   arg0: GET_VAR 'i: kotlin.Int declared in <root>.test' type=kotlin.Int origin=null
                   arg1: CONST Int type=kotlin.Int value=0
-                then: CALL 'public final fun unaryMinus (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null
+                then: CONST Int type=kotlin.Int value=-1
-                  $this: CONST Int type=kotlin.Int value=1
               BRANCH
                 if: CONST Boolean type=kotlin.Boolean value=true
                 then: CONST Int type=kotlin.Int value=0

compiler/testData/ir/irText/expressions/kt28006.fir.txt

@@ -38,11 +38,7 @@ FILE fqName:<root> fileName:/kt28006.kt
   PROPERTY name:testConst3 visibility:public modality:FINAL [const,val]
     FIELD PROPERTY_BACKING_FIELD name:testConst3 type:kotlin.String visibility:public [final,static]
       EXPRESSION_BODY
-        STRING_CONCATENATION type=kotlin.String
+        CONST String type=kotlin.String value="\uD83E\uDD17\uD83E\uDD17\uD83E\uDD17"
-          CONST String type=kotlin.String value="\uD83E"
-          CONST String type=kotlin.String value="\uDD17"
-          CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null
-            $this: CALL 'public final fun <get-testConst2> (): kotlin.String declared in <root>' type=kotlin.String origin=GET_PROPERTY
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-testConst3> visibility:public modality:FINAL <> () returnType:kotlin.String
       correspondingProperty: PROPERTY name:testConst3 visibility:public modality:FINAL [const,val]
       BLOCK_BODY
@@ -51,11 +47,7 @@ FILE fqName:<root> fileName:/kt28006.kt
   PROPERTY name:testConst4 visibility:public modality:FINAL [const,val]
     FIELD PROPERTY_BACKING_FIELD name:testConst4 type:kotlin.String visibility:public [final,static]
       EXPRESSION_BODY
-        STRING_CONCATENATION type=kotlin.String
+        CONST String type=kotlin.String value="\uD83E\uDD17\uD83E\uDD17\uD83E\uDD17\uD83E\uDD17"
-          CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null
-            $this: CALL 'public final fun <get-testConst2> (): kotlin.String declared in <root>' type=kotlin.String origin=GET_PROPERTY
-          CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null
-            $this: CALL 'public final fun <get-testConst2> (): kotlin.String declared in <root>' type=kotlin.String origin=GET_PROPERTY
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-testConst4> visibility:public modality:FINAL <> () returnType:kotlin.String
       correspondingProperty: PROPERTY name:testConst4 visibility:public modality:FINAL [const,val]
       BLOCK_BODY

compiler/testData/ir/irText/expressions/primitivesImplicitConversions.fir.txt

@@ -65,30 +65,24 @@ FILE fqName:<root> fileName:/primitivesImplicitConversions.kt
       VAR name:test3 type:kotlin.Long? [val]
         CONST Int type=kotlin.Int value=42
       VAR name:test4 type:kotlin.Long? [val]
-        CALL 'public final fun unaryMinus (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null
+        CONST Int type=kotlin.Int value=-1
-          $this: CONST Int type=kotlin.Int value=1
       VAR name:test5 type:kotlin.Long? [val]
-        CALL 'public final fun unaryMinus (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null
+        CONST Int type=kotlin.Int value=-1
-          $this: CONST Int type=kotlin.Int value=1
       VAR name:test6 type:kotlin.Short? [val]
-        CALL 'public final fun unaryMinus (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null
+        CONST Int type=kotlin.Int value=-1
-          $this: CONST Int type=kotlin.Int value=1
       VAR name:test7 type:kotlin.Byte? [val]
-        CALL 'public final fun unaryMinus (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null
+        CONST Int type=kotlin.Int value=-1
-          $this: CONST Int type=kotlin.Int value=1
   FUN name:testImplicitArguments visibility:public modality:FINAL <> (x:kotlin.Long) returnType:kotlin.Unit
     VALUE_PARAMETER name:x index:0 type:kotlin.Long
       EXPRESSION_BODY
-        CALL 'public final fun unaryMinus (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null
+        CONST Int type=kotlin.Int value=-1
-          $this: CONST Int type=kotlin.Int value=1
     BLOCK_BODY
   CLASS CLASS name:TestImplicitArguments modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestImplicitArguments
     CONSTRUCTOR visibility:public <> (x:kotlin.Long) returnType:<root>.TestImplicitArguments [primary]
       VALUE_PARAMETER name:x index:0 type:kotlin.Long
         EXPRESSION_BODY
-          CALL 'public final fun unaryMinus (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null
+          CONST Int type=kotlin.Int value=-1
-            $this: CONST Int type=kotlin.Int value=1
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestImplicitArguments modality:FINAL visibility:public superTypes:[kotlin.Any]'

compiler/testData/ir/irText/expressions/signedToUnsignedConversions_test.fir.txt

@@ -98,18 +98,18 @@ FILE fqName:<root> fileName:/signedToUnsignedConversions_test.kt
   FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
       ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/takeUByte]>#' type=IrErrorType
-        CALL 'public final fun <get-IMPLICIT_INT> (): kotlin.Int declared in <root>' type=kotlin.Int origin=GET_PROPERTY
+        CONST Int type=kotlin.Int value=255
       ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/takeUByte]>#' type=IrErrorType
-        CALL 'public final fun <get-EXPLICIT_INT> (): kotlin.Int declared in <root>' type=kotlin.Int origin=GET_PROPERTY
+        CONST Int type=kotlin.Int value=255
       ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/takeUShort]>#' type=IrErrorType
-        CALL 'public final fun <get-IMPLICIT_INT> (): kotlin.Int declared in <root>' type=kotlin.Int origin=GET_PROPERTY
+        CONST Int type=kotlin.Int value=255
       ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/takeUShort]>#' type=IrErrorType
-        CALL 'public final fun <get-BIGGER_THAN_UBYTE> (): kotlin.Int declared in <root>' type=kotlin.Int origin=GET_PROPERTY
+        CONST Int type=kotlin.Int value=256
       ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/takeUInt]>#' type=IrErrorType
-        CALL 'public final fun <get-IMPLICIT_INT> (): kotlin.Int declared in <root>' type=kotlin.Int origin=GET_PROPERTY
+        CONST Int type=kotlin.Int value=255
       ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/takeULong]>#' type=IrErrorType
-        CALL 'public final fun <get-IMPLICIT_INT> (): kotlin.Int declared in <root>' type=kotlin.Int origin=GET_PROPERTY
+        CONST Int type=kotlin.Int value=255
       ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/takeUBytes]>#' type=IrErrorType
-        CALL 'public final fun <get-IMPLICIT_INT> (): kotlin.Int declared in <root>' type=kotlin.Int origin=GET_PROPERTY
+        CONST Int type=kotlin.Int value=255
-        CALL 'public final fun <get-EXPLICIT_INT> (): kotlin.Int declared in <root>' type=kotlin.Int origin=GET_PROPERTY
+        CONST Int type=kotlin.Int value=255
         CONST Int type=kotlin.UInt value=42

compiler/testData/ir/irText/expressions/simpleUnaryOperators.fir.txt

@@ -8,8 +8,7 @@ FILE fqName:<root> fileName:/simpleUnaryOperators.kt
   FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Int
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test2 (): kotlin.Int declared in <root>'
-        CALL 'public final fun unaryMinus (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null
+        CONST Int type=kotlin.Int value=-42
-          $this: CONST Int type=kotlin.Int value=42
   FUN name:test3 visibility:public modality:FINAL <> (x:kotlin.Int) returnType:kotlin.Int
     VALUE_PARAMETER name:x index:0 type:kotlin.Int
     BLOCK_BODY
@@ -19,8 +18,7 @@ FILE fqName:<root> fileName:/simpleUnaryOperators.kt
   FUN name:test4 visibility:public modality:FINAL <> () returnType:kotlin.Int
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test4 (): kotlin.Int declared in <root>'
-        CALL 'public final fun unaryPlus (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null
+        CONST Int type=kotlin.Int value=42
-          $this: CONST Int type=kotlin.Int value=42
   FUN name:test5 visibility:public modality:FINAL <> (x:kotlin.Boolean) returnType:kotlin.Boolean
     VALUE_PARAMETER name:x index:0 type:kotlin.Boolean
     BLOCK_BODY
@@ -30,5 +28,4 @@ FILE fqName:<root> fileName:/simpleUnaryOperators.kt
   FUN name:test6 visibility:public modality:FINAL <> () returnType:kotlin.Boolean
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test6 (): kotlin.Boolean declared in <root>'
-        CALL 'public final fun not (): kotlin.Boolean [operator] declared in kotlin.Boolean' type=kotlin.Boolean origin=null
+        CONST Boolean type=kotlin.Boolean value=false
-          $this: CONST Boolean type=kotlin.Boolean value=true

compiler/testData/ir/irText/expressions/whenWithSubjectVariable.fir.txt

@@ -34,5 +34,4 @@ FILE fqName:<root> fileName:/whenWithSubjectVariable.kt
               then: CONST Int type=kotlin.Int value=4
             BRANCH
               if: CONST Boolean type=kotlin.Boolean value=true
-              then: CALL 'public final fun unaryMinus (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null
+              then: CONST Int type=kotlin.Int value=-1
-                $this: CONST Int type=kotlin.Int value=1