[IR] Split const folding into necessary one and for optimizations only

In this commit we have a lot of change in test data. This was caused by the way where we evaluate constants. We split constant evaluation into two distinct parts: only necessary evaluations for `fir2ir` (like const val and annotations) and optimizations for lowering. Now we don't do all constant evaluation on `fir2ir`, but IR dump is executed after this phase, so test data changed. #KT-58923
2023-05-28 18:43:30 +02:00
parent 8067df3c94
commit dd264cff50
96 changed files with 648 additions and 327 deletions
@@ -1,55 +0,0 @@
-FILE fqName:<root> fileName:/genericConstructorCallWithTypeArguments.kt
-  FUN name:testSimple visibility:public modality:FINAL <> () returnType:<root>.Box<kotlin.Long>
-    BLOCK_BODY
-      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) declared in <root>.Box' type=<root>.Box<kotlin.Long> origin=null
-          <class: T>: kotlin.Long
-          value: CONST Long type=kotlin.Long value=6
-  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?] reified:true
-    VALUE_PARAMETER name:n index:0 type:kotlin.Int
-    VALUE_PARAMETER name:block index:1 type:kotlin.Function0<T of <root>.testArray> [crossinline]
-    BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun testArray <T> (n: kotlin.Int, block: kotlin.Function0<T of <root>.testArray>): kotlin.Array<T of <root>.testArray> declared in <root>'
-        CONSTRUCTOR_CALL 'public constructor <init> (size: kotlin.Int, init: kotlin.Function1<kotlin.Int, T of kotlin.Array>) declared in kotlin.Array' type=kotlin.Array<T of <root>.testArray> origin=null
-          <class: T>: T of <root>.testArray
-          size: GET_VAR 'n: kotlin.Int declared in <root>.testArray' type=kotlin.Int origin=null
-          init: FUN_EXPR type=kotlin.Function1<kotlin.Int, T of <root>.testArray> origin=LAMBDA
-            FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (it:kotlin.Int) returnType:T of <root>.testArray
-              VALUE_PARAMETER name:it index:0 type:kotlin.Int
-              BLOCK_BODY
-                RETURN type=kotlin.Nothing from='local final fun <anonymous> (it: kotlin.Int): T of <root>.testArray declared in <root>.testArray'
-                  CALL 'public abstract fun invoke (): R of kotlin.Function0 declared in kotlin.Function0' type=T of <root>.testArray origin=INVOKE
-                    $this: GET_VAR 'block: kotlin.Function0<T of <root>.testArray> declared in <root>.testArray' type=kotlin.Function0<T of <root>.testArray> origin=VARIABLE_AS_FUNCTION
-  CLASS CLASS name:Box modality:FINAL visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Box<T of <root>.Box>
-    TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false
-    CONSTRUCTOR visibility:public <> (value:T of <root>.Box) returnType:<root>.Box<T of <root>.Box> [primary]
-      VALUE_PARAMETER name:value index:0 type:T of <root>.Box
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Box modality:FINAL visibility:public superTypes:[kotlin.Any]'
-    PROPERTY name:value visibility:public modality:FINAL [val]
-      FIELD PROPERTY_BACKING_FIELD name:value type:T of <root>.Box visibility:private [final]
-        EXPRESSION_BODY
-          GET_VAR 'value: T of <root>.Box declared in <root>.Box.<init>' type=T of <root>.Box origin=INITIALIZE_PROPERTY_FROM_PARAMETER
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-value> visibility:public modality:FINAL <> ($this:<root>.Box<T of <root>.Box>) returnType:T of <root>.Box
-        correspondingProperty: PROPERTY name:value visibility:public modality:FINAL [val]
-        $this: VALUE_PARAMETER name:<this> type:<root>.Box<T of <root>.Box>
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun <get-value> (): T of <root>.Box declared in <root>.Box'
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:T of <root>.Box visibility:private [final]' type=T of <root>.Box origin=null
-              receiver: GET_VAR '<this>: <root>.Box<T of <root>.Box> declared in <root>.Box.<get-value>' type=<root>.Box<T of <root>.Box> 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 declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> 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 declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> 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 declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
@@ -1,23 +0,0 @@
-fun testSimple(): Box<Long> {
-  return Box<Long>(value = 6L)
-}
-
-inline fun <reified T : Any?> testArray(n: Int, crossinline block: Function0<T>): Array<T> {
-  return Array<T>(size = n, init = local fun <anonymous>(it: Int): T {
-    return block.invoke()
-  }
-)
-}
-
-class Box<T : Any?> {
-  constructor(value: T) /* primary */ {
-    super/*Any*/()
-    /* <init>() */
-
-  }
-
-  val value: T
-    field = value
-    get
-
-}
@@ -1,3 +1,5 @@
+// FIR_IDENTICAL
+
 fun testSimple() = Box<Long>(2L * 3)

 inline fun <reified T> testArray(n: Int, crossinline block: () -> T): Array<T> {
@@ -0,0 +1,157 @@
+FILE fqName:<root> fileName:/literals.kt
+  PROPERTY name:test1 visibility:public modality:FINAL [val]
+    FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:private [final,static]
+      EXPRESSION_BODY
+        CONST Int type=kotlin.Int value=1
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:kotlin.Int
+      correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val]
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun <get-test1> (): kotlin.Int declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:private [final,static]' type=kotlin.Int origin=null
+  PROPERTY name:test2 visibility:public modality:FINAL [val]
+    FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:private [final,static]
+      EXPRESSION_BODY
+        CONST Int type=kotlin.Int value=-1
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test2> visibility:public modality:FINAL <> () returnType:kotlin.Int
+      correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [val]
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun <get-test2> (): kotlin.Int declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:private [final,static]' type=kotlin.Int origin=null
+  PROPERTY name:test3 visibility:public modality:FINAL [val]
+    FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Boolean visibility:private [final,static]
+      EXPRESSION_BODY
+        CONST Boolean type=kotlin.Boolean value=true
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test3> visibility:public modality:FINAL <> () returnType:kotlin.Boolean
+      correspondingProperty: PROPERTY name:test3 visibility:public modality:FINAL [val]
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun <get-test3> (): kotlin.Boolean declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Boolean visibility:private [final,static]' type=kotlin.Boolean origin=null
+  PROPERTY name:test4 visibility:public modality:FINAL [val]
+    FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Boolean visibility:private [final,static]
+      EXPRESSION_BODY
+        CONST Boolean type=kotlin.Boolean value=false
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test4> visibility:public modality:FINAL <> () returnType:kotlin.Boolean
+      correspondingProperty: PROPERTY name:test4 visibility:public modality:FINAL [val]
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun <get-test4> (): kotlin.Boolean declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Boolean visibility:private [final,static]' type=kotlin.Boolean origin=null
+  PROPERTY name:test5 visibility:public modality:FINAL [val]
+    FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.String visibility:private [final,static]
+      EXPRESSION_BODY
+        CONST String type=kotlin.String value="abc"
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test5> visibility:public modality:FINAL <> () returnType:kotlin.String
+      correspondingProperty: PROPERTY name:test5 visibility:public modality:FINAL [val]
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun <get-test5> (): kotlin.String declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.String visibility:private [final,static]' type=kotlin.String origin=null
+  PROPERTY name:test6 visibility:public modality:FINAL [val]
+    FIELD PROPERTY_BACKING_FIELD name:test6 type:kotlin.Nothing? visibility:private [final,static]
+      EXPRESSION_BODY
+        CONST Null type=kotlin.Nothing? value=null
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test6> visibility:public modality:FINAL <> () returnType:kotlin.Nothing?
+      correspondingProperty: PROPERTY name:test6 visibility:public modality:FINAL [val]
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun <get-test6> (): kotlin.Nothing? declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test6 type:kotlin.Nothing? visibility:private [final,static]' type=kotlin.Nothing? origin=null
+  PROPERTY name:test7 visibility:public modality:FINAL [val]
+    FIELD PROPERTY_BACKING_FIELD name:test7 type:kotlin.Long visibility:private [final,static]
+      EXPRESSION_BODY
+        CONST Long type=kotlin.Long value=1
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test7> visibility:public modality:FINAL <> () returnType:kotlin.Long
+      correspondingProperty: PROPERTY name:test7 visibility:public modality:FINAL [val]
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun <get-test7> (): kotlin.Long declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test7 type:kotlin.Long visibility:private [final,static]' type=kotlin.Long origin=null
+  PROPERTY name:test8 visibility:public modality:FINAL [val]
+    FIELD PROPERTY_BACKING_FIELD name:test8 type:kotlin.Long visibility:private [final,static]
+      EXPRESSION_BODY
+        CALL 'public final fun unaryMinus (): kotlin.Long declared in kotlin.Long' type=kotlin.Long origin=null
+          $this: CONST Long type=kotlin.Long value=1
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test8> visibility:public modality:FINAL <> () returnType:kotlin.Long
+      correspondingProperty: PROPERTY name:test8 visibility:public modality:FINAL [val]
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun <get-test8> (): kotlin.Long declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test8 type:kotlin.Long visibility:private [final,static]' type=kotlin.Long origin=null
+  PROPERTY name:test9 visibility:public modality:FINAL [val]
+    FIELD PROPERTY_BACKING_FIELD name:test9 type:kotlin.Double visibility:private [final,static]
+      EXPRESSION_BODY
+        CONST Double type=kotlin.Double value=1.0
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test9> visibility:public modality:FINAL <> () returnType:kotlin.Double
+      correspondingProperty: PROPERTY name:test9 visibility:public modality:FINAL [val]
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun <get-test9> (): kotlin.Double declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test9 type:kotlin.Double visibility:private [final,static]' type=kotlin.Double origin=null
+  PROPERTY name:test10 visibility:public modality:FINAL [val]
+    FIELD PROPERTY_BACKING_FIELD name:test10 type:kotlin.Double visibility:private [final,static]
+      EXPRESSION_BODY
+        CALL 'public final fun unaryMinus (): kotlin.Double declared in kotlin.Double' type=kotlin.Double origin=null
+          $this: CONST Double type=kotlin.Double value=1.0
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test10> visibility:public modality:FINAL <> () returnType:kotlin.Double
+      correspondingProperty: PROPERTY name:test10 visibility:public modality:FINAL [val]
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun <get-test10> (): kotlin.Double declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test10 type:kotlin.Double visibility:private [final,static]' type=kotlin.Double origin=null
+  PROPERTY name:test11 visibility:public modality:FINAL [val]
+    FIELD PROPERTY_BACKING_FIELD name:test11 type:kotlin.Float visibility:private [final,static]
+      EXPRESSION_BODY
+        CONST Float type=kotlin.Float value=1.0
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test11> visibility:public modality:FINAL <> () returnType:kotlin.Float
+      correspondingProperty: PROPERTY name:test11 visibility:public modality:FINAL [val]
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun <get-test11> (): kotlin.Float declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test11 type:kotlin.Float visibility:private [final,static]' type=kotlin.Float origin=null
+  PROPERTY name:test12 visibility:public modality:FINAL [val]
+    FIELD PROPERTY_BACKING_FIELD name:test12 type:kotlin.Float visibility:private [final,static]
+      EXPRESSION_BODY
+        CALL 'public final fun unaryMinus (): kotlin.Float declared in kotlin.Float' type=kotlin.Float origin=null
+          $this: CONST Float type=kotlin.Float value=1.0
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test12> visibility:public modality:FINAL <> () returnType:kotlin.Float
+      correspondingProperty: PROPERTY name:test12 visibility:public modality:FINAL [val]
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun <get-test12> (): kotlin.Float declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test12 type:kotlin.Float visibility:private [final,static]' type=kotlin.Float origin=null
+  PROPERTY name:test13 visibility:public modality:FINAL [val]
+    FIELD PROPERTY_BACKING_FIELD name:test13 type:kotlin.Char visibility:private [final,static]
+      EXPRESSION_BODY
+        CONST Char type=kotlin.Char value='a'
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test13> visibility:public modality:FINAL <> () returnType:kotlin.Char
+      correspondingProperty: PROPERTY name:test13 visibility:public modality:FINAL [val]
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun <get-test13> (): kotlin.Char declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test13 type:kotlin.Char visibility:private [final,static]' type=kotlin.Char origin=null
+  PROPERTY name:testB visibility:public modality:FINAL [val]
+    FIELD PROPERTY_BACKING_FIELD name:testB type:kotlin.Byte visibility:private [final,static]
+      EXPRESSION_BODY
+        CONST Byte type=kotlin.Byte value=1
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-testB> visibility:public modality:FINAL <> () returnType:kotlin.Byte
+      correspondingProperty: PROPERTY name:testB visibility:public modality:FINAL [val]
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun <get-testB> (): kotlin.Byte declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testB type:kotlin.Byte visibility:private [final,static]' type=kotlin.Byte origin=null
+  PROPERTY name:testS visibility:public modality:FINAL [val]
+    FIELD PROPERTY_BACKING_FIELD name:testS type:kotlin.Short visibility:private [final,static]
+      EXPRESSION_BODY
+        CONST Short type=kotlin.Short value=1
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-testS> visibility:public modality:FINAL <> () returnType:kotlin.Short
+      correspondingProperty: PROPERTY name:testS visibility:public modality:FINAL [val]
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun <get-testS> (): kotlin.Short declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testS type:kotlin.Short visibility:private [final,static]' type=kotlin.Short origin=null
+  PROPERTY name:testI visibility:public modality:FINAL [val]
+    FIELD PROPERTY_BACKING_FIELD name:testI type:kotlin.Int visibility:private [final,static]
+      EXPRESSION_BODY
+        CONST Int type=kotlin.Int value=1
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-testI> visibility:public modality:FINAL <> () returnType:kotlin.Int
+      correspondingProperty: PROPERTY name:testI visibility:public modality:FINAL [val]
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun <get-testI> (): kotlin.Int declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testI type:kotlin.Int visibility:private [final,static]' type=kotlin.Int origin=null
+  PROPERTY name:testL visibility:public modality:FINAL [val]
+    FIELD PROPERTY_BACKING_FIELD name:testL type:kotlin.Long visibility:private [final,static]
+      EXPRESSION_BODY
+        CONST Long type=kotlin.Long value=1
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-testL> visibility:public modality:FINAL <> () returnType:kotlin.Long
+      correspondingProperty: PROPERTY name:testL visibility:public modality:FINAL [val]
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun <get-testL> (): kotlin.Long declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testL type:kotlin.Long visibility:private [final,static]' type=kotlin.Long origin=null
@@ -0,0 +1,67 @@
+val test1: Int
+  field = 1
+  get
+
+val test2: Int
+  field = -1
+  get
+
+val test3: Boolean
+  field = true
+  get
+
+val test4: Boolean
+  field = false
+  get
+
+val test5: String
+  field = "abc"
+  get
+
+val test6: Nothing?
+  field = null
+  get
+
+val test7: Long
+  field = 1L
+  get
+
+val test8: Long
+  field = 1L.unaryMinus()
+  get
+
+val test9: Double
+  field = 1.0
+  get
+
+val test10: Double
+  field = 1.0.unaryMinus()
+  get
+
+val test11: Float
+  field = 1.0F
+  get
+
+val test12: Float
+  field = 1.0F.unaryMinus()
+  get
+
+val test13: Char
+  field = 'a'
+  get
+
+val testB: Byte
+  field = 1B
+  get
+
+val testS: Short
+  field = 1S
+  get
+
+val testI: Int
+  field = 1
+  get
+
+val testL: Long
+  field = 1L
+  get
@@ -1,5 +1,3 @@
-// FIR_IDENTICAL
-// IGNORE_BACKEND_K2: JS_IR
 val test1 = 1
 val test2 = -1
 val test3 = true
@@ -28,4 +28,5 @@ 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>'
-        CONST Boolean type=kotlin.Boolean value=false
+        CALL 'public final fun not (): kotlin.Boolean declared in kotlin.Boolean' type=kotlin.Boolean origin=null
+          $this: CONST Boolean type=kotlin.Boolean value=true
@@ -19,5 +19,5 @@ fun test5(x: Boolean): Boolean {
 }

 fun test6(): Boolean {
-  return false
+  return true.not()
 }