Update testData for irCfg and sourceRanges tests

compiler/testData/ir/irCfg/expressionFun.txt

@@ -2,11 +2,11 @@
 // FUN: foo
 BB 0
 CONTENT
-      1 FUN name:foo visibility:public modality:FINAL <> (arg:kotlin.Int) returnType:Int flags:
+      1 FUN name:foo visibility:public modality:FINAL <> (arg:kotlin.Int) returnType:kotlin.Int flags:
       2 GET_VAR 'value-parameter arg: Int' type=kotlin.Int origin=null
       3 RETURN type=kotlin.Nothing from='foo(Int): Int'
 OUTGOING -> NONE
-    Function exit: FUN name:foo visibility:public modality:FINAL <> (arg:kotlin.Int) returnType:Int flags:
+    Function exit: FUN name:foo visibility:public modality:FINAL <> (arg:kotlin.Int) returnType:kotlin.Int flags:
 
 // END FUN: foo
 

compiler/testData/ir/irCfg/expressionUnit.txt

@@ -2,11 +2,11 @@
 // FUN: foo
 BB 0
 CONTENT
-      1 FUN name:foo visibility:public modality:FINAL <> () returnType:Unit flags:
+      1 FUN name:foo visibility:public modality:FINAL <> () returnType:kotlin.Unit flags:
       2 GET_OBJECT 'Unit' type=kotlin.Unit
       3 RETURN type=kotlin.Nothing from='foo(): Unit'
 OUTGOING -> NONE
-    Function exit: FUN name:foo visibility:public modality:FINAL <> () returnType:Unit flags:
+    Function exit: FUN name:foo visibility:public modality:FINAL <> () returnType:kotlin.Unit flags:
 
 // END FUN: foo
 

compiler/testData/ir/irCfg/loop/digitCount.txt

@@ -2,7 +2,7 @@
 // FUN: digitCountInNumber
 BB 0
 CONTENT
-      1 FUN name:digitCountInNumber visibility:public modality:FINAL <> (n:kotlin.Int, m:kotlin.Int) returnType:Int flags:
+      1 FUN name:digitCountInNumber visibility:public modality:FINAL <> (n:kotlin.Int, m:kotlin.Int) returnType:kotlin.Int flags:
       2 CONST Int type=kotlin.Int value=0
       3 VAR name:count type:kotlin.Int flags:var
       4 GET_VAR 'value-parameter n: Int' type=kotlin.Int origin=null
@@ -60,7 +60,7 @@ CONTENT
       1 GET_VAR 'count: Int' type=kotlin.Int origin=null
       2 RETURN type=kotlin.Nothing from='digitCountInNumber(Int, Int): Int'
 OUTGOING -> NONE
-    Function exit: FUN name:digitCountInNumber visibility:public modality:FINAL <> (n:kotlin.Int, m:kotlin.Int) returnType:Int flags:
+    Function exit: FUN name:digitCountInNumber visibility:public modality:FINAL <> (n:kotlin.Int, m:kotlin.Int) returnType:kotlin.Int flags:
 
 // END FUN: digitCountInNumber
 

compiler/testData/ir/irCfg/loop/factorial.txt

@@ -2,7 +2,7 @@
 // FUN: factorial
 BB 0
 CONTENT
-      1 FUN name:factorial visibility:public modality:FINAL <> (i:kotlin.Int) returnType:Int flags:
+      1 FUN name:factorial visibility:public modality:FINAL <> (i:kotlin.Int) returnType:kotlin.Int flags:
       2 CONST Int type=kotlin.Int value=1
       3 VAR name:result type:kotlin.Int flags:var
       4 CONST Int type=kotlin.Int value=2
@@ -43,7 +43,7 @@ CONTENT
       1 GET_VAR 'result: Int' type=kotlin.Int origin=null
       2 RETURN type=kotlin.Nothing from='factorial(Int): Int'
 OUTGOING -> NONE
-    Function exit: FUN name:factorial visibility:public modality:FINAL <> (i:kotlin.Int) returnType:Int flags:
+    Function exit: FUN name:factorial visibility:public modality:FINAL <> (i:kotlin.Int) returnType:kotlin.Int flags:
 
 // END FUN: factorial
 

compiler/testData/ir/irCfg/loop/isPerfect.txt

@@ -2,7 +2,7 @@
 // FUN: isPerfect
 BB 0
 CONTENT
-      1 FUN name:isPerfect visibility:public modality:FINAL <> (n:kotlin.Int) returnType:Boolean flags:
+      1 FUN name:isPerfect visibility:public modality:FINAL <> (n:kotlin.Int) returnType:kotlin.Boolean flags:
       2 CONST Int type=kotlin.Int value=1
       3 VAR name:sum type:kotlin.Int flags:var
       4 CONST Int type=kotlin.Int value=2
@@ -81,7 +81,7 @@ CONTENT
       3 CALL 'EQEQ(Any?, Any?): Boolean' type=kotlin.Boolean origin=EQEQ
       4 RETURN type=kotlin.Nothing from='isPerfect(Int): Boolean'
 OUTGOING -> NONE
-    Function exit: FUN name:isPerfect visibility:public modality:FINAL <> (n:kotlin.Int) returnType:Boolean flags:
+    Function exit: FUN name:isPerfect visibility:public modality:FINAL <> (n:kotlin.Int) returnType:kotlin.Boolean flags:
 
 // END FUN: isPerfect
 

compiler/testData/ir/irCfg/returnUnit.txt

@@ -2,11 +2,11 @@
 // FUN: foo
 BB 0
 CONTENT
-      1 FUN name:foo visibility:public modality:FINAL <> () returnType:Unit flags:
+      1 FUN name:foo visibility:public modality:FINAL <> () returnType:kotlin.Unit flags:
       2 GET_OBJECT 'Unit' type=kotlin.Unit
       3 RETURN type=kotlin.Nothing from='foo(): Unit'
 OUTGOING -> NONE
-    Function exit: FUN name:foo visibility:public modality:FINAL <> () returnType:Unit flags:
+    Function exit: FUN name:foo visibility:public modality:FINAL <> () returnType:kotlin.Unit flags:
 
 // END FUN: foo
 

compiler/testData/ir/irCfg/sequentialFun.txt

@@ -2,7 +2,7 @@
 // FUN: foo
 BB 0
 CONTENT
-      1 FUN name:foo visibility:public modality:FINAL <> (arg:kotlin.Int) returnType:Int flags:
+      1 FUN name:foo visibility:public modality:FINAL <> (arg:kotlin.Int) returnType:kotlin.Int flags:
       2 GET_VAR 'value-parameter arg: Int' type=kotlin.Int origin=null
       3 CONST Int type=kotlin.Int value=2
       4 CALL 'times(Int): Int' type=kotlin.Int origin=MUL
@@ -10,7 +10,7 @@ CONTENT
       6 GET_VAR 'dbl: Int' type=kotlin.Int origin=null
       7 RETURN type=kotlin.Nothing from='foo(Int): Int'
 OUTGOING -> NONE
-    Function exit: FUN name:foo visibility:public modality:FINAL <> (arg:kotlin.Int) returnType:Int flags:
+    Function exit: FUN name:foo visibility:public modality:FINAL <> (arg:kotlin.Int) returnType:kotlin.Int flags:
 
 // END FUN: foo
 

compiler/testData/ir/irCfg/simpleFun.txt

@@ -2,9 +2,9 @@
 // FUN: foo
 BB 0
 CONTENT
-      1 FUN name:foo visibility:public modality:FINAL <> () returnType:Unit flags:
+      1 FUN name:foo visibility:public modality:FINAL <> () returnType:kotlin.Unit flags:
 OUTGOING -> NONE
-    Function exit: FUN name:foo visibility:public modality:FINAL <> () returnType:Unit flags:
+    Function exit: FUN name:foo visibility:public modality:FINAL <> () returnType:kotlin.Unit flags:
 
 // END FUN: foo
 

compiler/testData/ir/irCfg/simpleReturn.txt

@@ -2,11 +2,11 @@
 // FUN: foo
 BB 0
 CONTENT
-      1 FUN name:foo visibility:public modality:FINAL <> () returnType:Unit flags:
+      1 FUN name:foo visibility:public modality:FINAL <> () returnType:kotlin.Unit flags:
       2 GET_OBJECT 'Unit' type=kotlin.Unit
       3 RETURN type=kotlin.Nothing from='foo(): Unit'
 OUTGOING -> NONE
-    Function exit: FUN name:foo visibility:public modality:FINAL <> () returnType:Unit flags:
+    Function exit: FUN name:foo visibility:public modality:FINAL <> () returnType:kotlin.Unit flags:
 
 // END FUN: foo
 

compiler/testData/ir/irCfg/when/cascadeIf.txt

@@ -2,7 +2,7 @@
 // FUN: compare
 BB 0
 CONTENT
-      1 FUN name:compare visibility:public modality:FINAL <> (x:kotlin.Int, y:kotlin.Int) returnType:Int flags:
+      1 FUN name:compare visibility:public modality:FINAL <> (x:kotlin.Int, y:kotlin.Int) returnType:kotlin.Int flags:
       2 WHEN type=kotlin.Int origin=WHEN
       3 GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=null
       4 GET_VAR 'value-parameter y: Int' type=kotlin.Int origin=null
@@ -49,7 +49,7 @@ INCOMING <- BB 3, 4, 5
 CONTENT
       1 RETURN type=kotlin.Nothing from='compare(Int, Int): Int'
 OUTGOING -> NONE
-    Function exit: FUN name:compare visibility:public modality:FINAL <> (x:kotlin.Int, y:kotlin.Int) returnType:Int flags:
+    Function exit: FUN name:compare visibility:public modality:FINAL <> (x:kotlin.Int, y:kotlin.Int) returnType:kotlin.Int flags:
 
 // END FUN: compare
 

compiler/testData/ir/irCfg/when/emptyWhen.txt

@@ -2,7 +2,7 @@
 // FUN: empty
 BB 0
 CONTENT
-      1 FUN name:empty visibility:public modality:FINAL <> () returnType:Int flags:
+      1 FUN name:empty visibility:public modality:FINAL <> () returnType:kotlin.Int flags:
       2 WHEN type=kotlin.Int origin=WHEN
 OUTGOING -> BB 1
     CONST Boolean type=kotlin.Boolean value=true
@@ -19,7 +19,7 @@ INCOMING <- BB 1
 CONTENT
       1 RETURN type=kotlin.Nothing from='empty(): Int'
 OUTGOING -> NONE
-    Function exit: FUN name:empty visibility:public modality:FINAL <> () returnType:Int flags:
+    Function exit: FUN name:empty visibility:public modality:FINAL <> () returnType:kotlin.Int flags:
 
 // END FUN: empty
 

compiler/testData/ir/irCfg/when/expressionIf.txt

@@ -2,7 +2,7 @@
 // FUN: max
 BB 0
 CONTENT
-      1 FUN name:max visibility:public modality:FINAL <> (x:kotlin.Int, y:kotlin.Int) returnType:Int flags:
+      1 FUN name:max visibility:public modality:FINAL <> (x:kotlin.Int, y:kotlin.Int) returnType:kotlin.Int flags:
       2 WHEN type=kotlin.Int origin=null
       3 GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=null
       4 GET_VAR 'value-parameter y: Int' type=kotlin.Int origin=null
@@ -34,7 +34,7 @@ INCOMING <- BB 2, 3
 CONTENT
       1 RETURN type=kotlin.Nothing from='max(Int, Int): Int'
 OUTGOING -> NONE
-    Function exit: FUN name:max visibility:public modality:FINAL <> (x:kotlin.Int, y:kotlin.Int) returnType:Int flags:
+    Function exit: FUN name:max visibility:public modality:FINAL <> (x:kotlin.Int, y:kotlin.Int) returnType:kotlin.Int flags:
 
 // END FUN: max
 

compiler/testData/ir/irCfg/when/ifChain.txt

@@ -2,7 +2,7 @@
 // FUN: minBiRoot
 BB 0
 CONTENT
-      1 FUN name:minBiRoot visibility:public modality:FINAL <> (a:kotlin.Double, b:kotlin.Double, c:kotlin.Double) returnType:Double flags:
+      1 FUN name:minBiRoot visibility:public modality:FINAL <> (a:kotlin.Double, b:kotlin.Double, c:kotlin.Double) returnType:kotlin.Double flags:
       2 WHEN type=kotlin.Unit origin=null
       3 GET_VAR 'value-parameter a: Double' type=kotlin.Double origin=null
       4 CONST Double type=kotlin.Double value=0.0
@@ -24,7 +24,7 @@ CONTENT
       1 CONST Double type=kotlin.Double value=1.0
       2 RETURN type=kotlin.Nothing from='minBiRoot(Double, Double, Double): Double'
 OUTGOING -> NONE
-    Function exit: FUN name:minBiRoot visibility:public modality:FINAL <> (a:kotlin.Double, b:kotlin.Double, c:kotlin.Double) returnType:Double flags:
+    Function exit: FUN name:minBiRoot visibility:public modality:FINAL <> (a:kotlin.Double, b:kotlin.Double, c:kotlin.Double) returnType:kotlin.Double flags:
 BB 3
 INCOMING <- BB 1
     CALL 'ieee754equals(Double?, Double?): Boolean' type=kotlin.Boolean origin=EQEQ
@@ -46,7 +46,7 @@ CONTENT
       1 CONST Double type=kotlin.Double value=2.0
       2 RETURN type=kotlin.Nothing from='minBiRoot(Double, Double, Double): Double'
 OUTGOING -> NONE
-    Function exit: FUN name:minBiRoot visibility:public modality:FINAL <> (a:kotlin.Double, b:kotlin.Double, c:kotlin.Double) returnType:Double flags:
+    Function exit: FUN name:minBiRoot visibility:public modality:FINAL <> (a:kotlin.Double, b:kotlin.Double, c:kotlin.Double) returnType:kotlin.Double flags:
 BB 5
 INCOMING <- BB 3
     CALL 'less(Double, Double): Boolean' type=kotlin.Boolean origin=LT
@@ -55,7 +55,7 @@ CONTENT
       2 CALL 'unaryMinus(): Double' type=kotlin.Double origin=UMINUS
       3 RETURN type=kotlin.Nothing from='minBiRoot(Double, Double, Double): Double'
 OUTGOING -> NONE
-    Function exit: FUN name:minBiRoot visibility:public modality:FINAL <> (a:kotlin.Double, b:kotlin.Double, c:kotlin.Double) returnType:Double flags:
+    Function exit: FUN name:minBiRoot visibility:public modality:FINAL <> (a:kotlin.Double, b:kotlin.Double, c:kotlin.Double) returnType:kotlin.Double flags:
 BB 6
 INCOMING <- BB 0
     CALL 'ieee754equals(Double?, Double?): Boolean' type=kotlin.Boolean origin=EQEQ
@@ -82,7 +82,7 @@ CONTENT
       1 CONST Double type=kotlin.Double value=3.0
       2 RETURN type=kotlin.Nothing from='minBiRoot(Double, Double, Double): Double'
 OUTGOING -> NONE
-    Function exit: FUN name:minBiRoot visibility:public modality:FINAL <> (a:kotlin.Double, b:kotlin.Double, c:kotlin.Double) returnType:Double flags:
+    Function exit: FUN name:minBiRoot visibility:public modality:FINAL <> (a:kotlin.Double, b:kotlin.Double, c:kotlin.Double) returnType:kotlin.Double flags:
 BB 8
 INCOMING <- BB 6
     CALL 'less(Double, Double): Boolean' type=kotlin.Boolean origin=LT
@@ -167,7 +167,7 @@ INCOMING <- BB 14, 15
 CONTENT
       1 RETURN type=kotlin.Nothing from='minBiRoot(Double, Double, Double): Double'
 OUTGOING -> NONE
-    Function exit: FUN name:minBiRoot visibility:public modality:FINAL <> (a:kotlin.Double, b:kotlin.Double, c:kotlin.Double) returnType:Double flags:
+    Function exit: FUN name:minBiRoot visibility:public modality:FINAL <> (a:kotlin.Double, b:kotlin.Double, c:kotlin.Double) returnType:kotlin.Double flags:
 
 // END FUN: minBiRoot
 

compiler/testData/ir/irCfg/when/whenReturn.txt

@@ -2,7 +2,7 @@
 // FUN: toString
 BB 0
 CONTENT
-      1 FUN name:toString visibility:public modality:FINAL <> (grade:kotlin.String) returnType:String flags:
+      1 FUN name:toString visibility:public modality:FINAL <> (grade:kotlin.String) returnType:kotlin.String flags:
       2 GET_VAR 'value-parameter grade: String' type=kotlin.String origin=null
       3 VAR IR_TEMPORARY_VARIABLE name:tmp0_subject type:kotlin.String flags:val
       4 WHEN type=kotlin.Nothing origin=WHEN
@@ -47,7 +47,7 @@ CONTENT
       1 CONST String type=kotlin.String value=Excellent
       2 RETURN type=kotlin.Nothing from='toString(String): String'
 OUTGOING -> NONE
-    Function exit: FUN name:toString visibility:public modality:FINAL <> (grade:kotlin.String) returnType:String flags:
+    Function exit: FUN name:toString visibility:public modality:FINAL <> (grade:kotlin.String) returnType:kotlin.String flags:
 BB 6
 INCOMING <- BB 1
     CALL 'EQEQ(Any?, Any?): Boolean' type=kotlin.Boolean origin=EQEQ
@@ -55,7 +55,7 @@ CONTENT
       1 CONST String type=kotlin.String value=Good
       2 RETURN type=kotlin.Nothing from='toString(String): String'
 OUTGOING -> NONE
-    Function exit: FUN name:toString visibility:public modality:FINAL <> (grade:kotlin.String) returnType:String flags:
+    Function exit: FUN name:toString visibility:public modality:FINAL <> (grade:kotlin.String) returnType:kotlin.String flags:
 BB 7
 INCOMING <- BB 2
     CALL 'EQEQ(Any?, Any?): Boolean' type=kotlin.Boolean origin=EQEQ
@@ -63,7 +63,7 @@ CONTENT
       1 CONST String type=kotlin.String value=Mediocre
       2 RETURN type=kotlin.Nothing from='toString(String): String'
 OUTGOING -> NONE
-    Function exit: FUN name:toString visibility:public modality:FINAL <> (grade:kotlin.String) returnType:String flags:
+    Function exit: FUN name:toString visibility:public modality:FINAL <> (grade:kotlin.String) returnType:kotlin.String flags:
 BB 8
 INCOMING <- BB 3
     CALL 'EQEQ(Any?, Any?): Boolean' type=kotlin.Boolean origin=EQEQ
@@ -71,7 +71,7 @@ CONTENT
       1 CONST String type=kotlin.String value=Fair
       2 RETURN type=kotlin.Nothing from='toString(String): String'
 OUTGOING -> NONE
-    Function exit: FUN name:toString visibility:public modality:FINAL <> (grade:kotlin.String) returnType:String flags:
+    Function exit: FUN name:toString visibility:public modality:FINAL <> (grade:kotlin.String) returnType:kotlin.String flags:
 BB 9
 INCOMING <- BB 4
     CONST Boolean type=kotlin.Boolean value=true
@@ -79,7 +79,7 @@ CONTENT
       1 CONST String type=kotlin.String value=Failure
       2 RETURN type=kotlin.Nothing from='toString(String): String'
 OUTGOING -> NONE
-    Function exit: FUN name:toString visibility:public modality:FINAL <> (grade:kotlin.String) returnType:String flags:
+    Function exit: FUN name:toString visibility:public modality:FINAL <> (grade:kotlin.String) returnType:kotlin.String flags:
 BB 10
 INCOMING <- BB 4
     CONST Boolean type=kotlin.Boolean value=true
@@ -87,7 +87,7 @@ CONTENT
       1 CONST String type=kotlin.String value=???
       2 RETURN type=kotlin.Nothing from='toString(String): String'
 OUTGOING -> NONE
-    Function exit: FUN name:toString visibility:public modality:FINAL <> (grade:kotlin.String) returnType:String flags:
+    Function exit: FUN name:toString visibility:public modality:FINAL <> (grade:kotlin.String) returnType:kotlin.String flags:
 
 // END FUN: toString
 

compiler/testData/ir/sourceRanges/augmentedAssignmentWithExpression.txt

@@ -1,43 +1,43 @@
 @0:0..23:0 FILE fqName:test fileName:/augmentedAssignmentWithExpression.kt
-  @2:0..8:1 CLASS CLASS name:Host modality:FINAL visibility:public flags:
+  @2:0..8:1 CLASS CLASS name:Host modality:FINAL visibility:public flags: superTypes:[kotlin.Any]
     @2:0..8:1 VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:test.Host flags:
     @2:0..8:1 CONSTRUCTOR visibility:public <> () returnType:test.Host flags:primary
       @2:0..8:1 BLOCK_BODY
         @2:0..8:1 DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         @2:0..8:1 INSTANCE_INITIALIZER_CALL classDescriptor='Host'
-    @3:4..38 FUN name:plusAssign visibility:public modality:FINAL <> ($this:test.Host, x:kotlin.Int) returnType:Unit flags:
+    @3:4..38 FUN name:plusAssign visibility:public modality:FINAL <> ($this:test.Host, x:kotlin.Int) returnType:kotlin.Unit flags:
       @3:4..38 VALUE_PARAMETER name:<this> type:test.Host flags:
       @3:28..34 VALUE_PARAMETER name:x index:0 type:kotlin.Int flags:
       @3:36..38 BLOCK_BODY
-    @5:4..7:5 FUN name:test1 visibility:public modality:FINAL <> ($this:test.Host) returnType:Unit flags:
+    @5:4..7:5 FUN name:test1 visibility:public modality:FINAL <> ($this:test.Host) returnType:kotlin.Unit flags:
       @5:4..7:5 VALUE_PARAMETER name:<this> type:test.Host flags:
       @5:16..7:5 BLOCK_BODY
         @6:8..17 CALL 'plusAssign(Int): Unit' type=kotlin.Unit origin=PLUSEQ
           @6:8..12 GET_VAR 'this@Host: Host' type=test.Host origin=PLUSEQ
           @6:16..17 CONST Int type=kotlin.Int value=1
-    @2:0..8:1 FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:Boolean flags:
+    @2:0..8:1 FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean flags:
       @2:0..8:1 VALUE_PARAMETER name:<this> type:kotlin.Any flags:
       @-1:-1..-1 VALUE_PARAMETER name:other index:0 type:kotlin.Any? flags:
-    @2:0..8:1 FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:Int flags:
+    @2:0..8:1 FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int flags:
       @2:0..8:1 VALUE_PARAMETER name:<this> type:kotlin.Any flags:
-    @2:0..8:1 FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:String flags:
+    @2:0..8:1 FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String flags:
       @2:0..8:1 VALUE_PARAMETER name:<this> type:kotlin.Any flags:
-  @10:0..18 FUN name:foo visibility:public modality:FINAL <> () returnType:Host flags:
+  @10:0..18 FUN name:foo visibility:public modality:FINAL <> () returnType:test.Host flags:
     @10:12..18 BLOCK_BODY
       @10:12..18 RETURN type=kotlin.Nothing from='foo(): Host'
         @10:12..18 CALL 'constructor Host()' type=test.Host origin=null
-  @12:0..14:1 FUN name:test2 visibility:public modality:FINAL <> ($receiver:test.Host) returnType:Unit flags:
+  @12:0..14:1 FUN name:test2 visibility:public modality:FINAL <> ($receiver:test.Host) returnType:kotlin.Unit flags:
     @12:4..8 VALUE_PARAMETER name:<this> type:test.Host flags:
     @12:17..14:1 BLOCK_BODY
       @13:4..13 CALL 'plusAssign(Int): Unit' type=kotlin.Unit origin=PLUSEQ
         @13:4..8 GET_VAR 'this@test2: Host' type=test.Host origin=PLUSEQ
         @13:12..13 CONST Int type=kotlin.Int value=1
-  @16:0..18:1 FUN name:test3 visibility:public modality:FINAL <> () returnType:Unit flags:
+  @16:0..18:1 FUN name:test3 visibility:public modality:FINAL <> () returnType:kotlin.Unit flags:
     @16:12..18:1 BLOCK_BODY
       @17:4..14 CALL 'plusAssign(Int): Unit' type=kotlin.Unit origin=PLUSEQ
         @17:4..9 CALL 'foo(): Host' type=test.Host origin=null
         @17:13..14 CONST Int type=kotlin.Int value=1
-  @20:0..22:1 FUN name:test4 visibility:public modality:FINAL <> (a:() -> test.Host) returnType:Unit flags:
+  @20:0..22:1 FUN name:test4 visibility:public modality:FINAL <> (a:() -> test.Host) returnType:kotlin.Unit flags:
     @20:10..23 VALUE_PARAMETER name:a index:0 type:() -> test.Host flags:
     @20:25..22:1 BLOCK_BODY
       @21:4..12 CALL 'plusAssign(Int): Unit' type=kotlin.Unit origin=PLUSEQ

compiler/testData/ir/sourceRanges/kt17108.txt

@@ -1,5 +1,5 @@
 @0:0..26:1 FILE fqName:<root> fileName:/kt17108.kt
-  @0:0..26:1 CLASS INTERFACE name:Boolean modality:ABSTRACT visibility:public flags:
+  @0:0..26:1 CLASS INTERFACE name:Boolean modality:ABSTRACT visibility:public flags: superTypes:[kotlin.Any]
     @0:0..26:1 VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:Boolean flags:
     @5:4..8:38 FUN name:not visibility:public modality:ABSTRACT <> ($this:Boolean) returnType:Boolean flags:
       @5:4..8:38 VALUE_PARAMETER name:<this> type:Boolean flags:
@@ -12,13 +12,13 @@
     @20:4..23:42 FUN name:xor visibility:public modality:ABSTRACT <> ($this:Boolean, other:Boolean) returnType:Boolean flags:
       @20:4..23:42 VALUE_PARAMETER name:<this> type:Boolean flags:
       @23:18..32 VALUE_PARAMETER name:other index:0 type:Boolean flags:
-    @25:4..38 FUN name:compareTo visibility:public modality:ABSTRACT <> ($this:Boolean, other:Boolean) returnType:Int flags:
+    @25:4..38 FUN name:compareTo visibility:public modality:ABSTRACT <> ($this:Boolean, other:Boolean) returnType:kotlin.Int flags:
       @25:4..38 VALUE_PARAMETER name:<this> type:Boolean flags:
       @25:18..32 VALUE_PARAMETER name:other index:0 type:Boolean flags:
-    @0:0..26:1 FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:Boolean flags:
+    @0:0..26:1 FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean flags:
       @0:0..26:1 VALUE_PARAMETER name:<this> type:kotlin.Any flags:
       @-1:-1..-1 VALUE_PARAMETER name:other index:0 type:kotlin.Any? flags:
-    @0:0..26:1 FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:Int flags:
+    @0:0..26:1 FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int flags:
       @0:0..26:1 VALUE_PARAMETER name:<this> type:kotlin.Any flags:
-    @0:0..26:1 FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:String flags:
+    @0:0..26:1 FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String flags:
       @0:0..26:1 VALUE_PARAMETER name:<this> type:kotlin.Any flags:

compiler/testData/ir/sourceRanges/synthesizedDataClassMembers.txt

@@ -1,5 +1,5 @@
 @0:0..4:1 FILE fqName:<root> fileName:/synthesizedDataClassMembers.kt
-  @0:0..4:1 CLASS CLASS name:C modality:FINAL visibility:public flags:data
+  @0:0..4:1 CLASS CLASS name:C modality:FINAL visibility:public flags:data superTypes:[kotlin.Any]
     @0:0..4:1 VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:C flags:
     @0:0..4:1 CONSTRUCTOR visibility:public <> (x:kotlin.Int, y:kotlin.String, z:kotlin.Any) returnType:C flags:primary
       @1:8..18 VALUE_PARAMETER name:x index:0 type:kotlin.Int flags:
@@ -8,49 +8,49 @@
       @0:0..4:1 BLOCK_BODY
         @0:0..4:1 DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         @0:0..4:1 INSTANCE_INITIALIZER_CALL classDescriptor='C'
-    @1:8..18 PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:val
+    @1:8..18 PROPERTY name:x visibility:public modality:FINAL flags:val
       @1:8..18 FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public flags:final
         @1:8..18 EXPRESSION_BODY
           @1:8..18 GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
-      @1:8..18 FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:C) returnType:Int flags:
+      @1:8..18 FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:C) returnType:kotlin.Int flags:
         @-1:-1..-1 VALUE_PARAMETER name:<this> type:C flags:
         @1:8..18 BLOCK_BODY
           @1:8..18 RETURN type=kotlin.Nothing from='<get-x>(): Int'
             @1:8..18 GET_FIELD 'x: Int' type=kotlin.Int origin=null
               @1:8..18 GET_VAR 'this@C: C' type=C origin=null
-    @2:8..21 PROPERTY name:y type:kotlin.String visibility:public modality:FINAL flags:val
+    @2:8..21 PROPERTY name:y visibility:public modality:FINAL flags:val
       @2:8..21 FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.String visibility:public flags:final
         @2:8..21 EXPRESSION_BODY
           @2:8..21 GET_VAR 'value-parameter y: String' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
-      @2:8..21 FUN DEFAULT_PROPERTY_ACCESSOR name:<get-y> visibility:public modality:FINAL <> ($this:C) returnType:String flags:
+      @2:8..21 FUN DEFAULT_PROPERTY_ACCESSOR name:<get-y> visibility:public modality:FINAL <> ($this:C) returnType:kotlin.String flags:
         @-1:-1..-1 VALUE_PARAMETER name:<this> type:C flags:
         @2:8..21 BLOCK_BODY
           @2:8..21 RETURN type=kotlin.Nothing from='<get-y>(): String'
             @2:8..21 GET_FIELD 'y: String' type=kotlin.String origin=null
               @2:8..21 GET_VAR 'this@C: C' type=C origin=null
-    @3:8..18 PROPERTY name:z type:kotlin.Any visibility:public modality:FINAL flags:val
+    @3:8..18 PROPERTY name:z visibility:public modality:FINAL flags:val
       @3:8..18 FIELD PROPERTY_BACKING_FIELD name:z type:kotlin.Any visibility:public flags:final
         @3:8..18 EXPRESSION_BODY
           @3:8..18 GET_VAR 'value-parameter z: Any' type=kotlin.Any origin=INITIALIZE_PROPERTY_FROM_PARAMETER
-      @3:8..18 FUN DEFAULT_PROPERTY_ACCESSOR name:<get-z> visibility:public modality:FINAL <> ($this:C) returnType:Any flags:
+      @3:8..18 FUN DEFAULT_PROPERTY_ACCESSOR name:<get-z> visibility:public modality:FINAL <> ($this:C) returnType:kotlin.Any flags:
         @-1:-1..-1 VALUE_PARAMETER name:<this> type:C flags:
         @3:8..18 BLOCK_BODY
           @3:8..18 RETURN type=kotlin.Nothing from='<get-z>(): Any'
             @3:8..18 GET_FIELD 'z: Any' type=kotlin.Any origin=null
               @3:8..18 GET_VAR 'this@C: C' type=C origin=null
-    @1:8..18 FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:C) returnType:Int flags:
+    @1:8..18 FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:C) returnType:kotlin.Int flags:
       @-1:-1..-1 VALUE_PARAMETER name:<this> type:C flags:
       @1:8..18 BLOCK_BODY
         @1:8..18 RETURN type=kotlin.Nothing from='component1(): Int'
           @1:8..18 CALL '<get-x>(): Int' type=kotlin.Int origin=GET_PROPERTY
             @1:8..18 GET_VAR 'this@C: C' type=C origin=null
-    @2:8..21 FUN GENERATED_DATA_CLASS_MEMBER name:component2 visibility:public modality:FINAL <> ($this:C) returnType:String flags:
+    @2:8..21 FUN GENERATED_DATA_CLASS_MEMBER name:component2 visibility:public modality:FINAL <> ($this:C) returnType:kotlin.String flags:
       @-1:-1..-1 VALUE_PARAMETER name:<this> type:C flags:
       @2:8..21 BLOCK_BODY
         @2:8..21 RETURN type=kotlin.Nothing from='component2(): String'
           @2:8..21 CALL '<get-y>(): String' type=kotlin.String origin=GET_PROPERTY
             @2:8..21 GET_VAR 'this@C: C' type=C origin=null
-    @3:8..18 FUN GENERATED_DATA_CLASS_MEMBER name:component3 visibility:public modality:FINAL <> ($this:C) returnType:Any flags:
+    @3:8..18 FUN GENERATED_DATA_CLASS_MEMBER name:component3 visibility:public modality:FINAL <> ($this:C) returnType:kotlin.Any flags:
       @-1:-1..-1 VALUE_PARAMETER name:<this> type:C flags:
       @3:8..18 BLOCK_BODY
         @3:8..18 RETURN type=kotlin.Nothing from='component3(): Any'
@@ -76,7 +76,7 @@
             @0:0..4:1 GET_VAR 'value-parameter x: Int = ...' type=kotlin.Int origin=null
             @0:0..4:1 GET_VAR 'value-parameter y: String = ...' type=kotlin.String origin=null
             @0:0..4:1 GET_VAR 'value-parameter z: Any = ...' type=kotlin.Any origin=null
-    @0:0..4:1 FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:C) returnType:String flags:
+    @0:0..4:1 FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:C) returnType:kotlin.String flags:
       @-1:-1..-1 VALUE_PARAMETER name:<this> type:C flags:
       @0:0..4:1 BLOCK_BODY
         @0:0..4:1 RETURN type=kotlin.Nothing from='toString(): String'
@@ -94,7 +94,7 @@
             @0:0..4:1 CALL '<get-z>(): Any' type=kotlin.Any origin=GET_PROPERTY
               @0:0..4:1 GET_VAR 'this@C: C' type=C origin=null
             @0:0..4:1 CONST String type=kotlin.String value=)
-    @0:0..4:1 FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:C) returnType:Int flags:
+    @0:0..4:1 FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:C) returnType:kotlin.Int flags:
       @-1:-1..-1 VALUE_PARAMETER name:<this> type:C flags:
       @0:0..4:1 BLOCK_BODY
         @0:0..4:1 VAR IR_TEMPORARY_VARIABLE name:tmp0_result type:kotlin.Int flags:var
@@ -121,7 +121,7 @@
                 @0:0..4:1 GET_VAR 'this@C: C' type=C origin=null
         @0:0..4:1 RETURN type=kotlin.Nothing from='hashCode(): Int'
           @0:0..4:1 GET_VAR 'tmp0_result: Int' type=kotlin.Int origin=null
-    @0:0..4:1 FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:C, other:kotlin.Any?) returnType:Boolean flags:
+    @0:0..4:1 FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:C, other:kotlin.Any?) returnType:kotlin.Boolean flags:
       @-1:-1..-1 VALUE_PARAMETER name:<this> type:C flags:
       @-1:-1..-1 VALUE_PARAMETER name:other index:0 type:kotlin.Any? flags:
       @0:0..4:1 BLOCK_BODY
@@ -139,7 +139,7 @@
             @0:0..4:1 RETURN type=kotlin.Nothing from='equals(Any?): Boolean'
               @0:0..4:1 CONST Boolean type=kotlin.Boolean value=false
         @0:0..4:1 VAR IR_TEMPORARY_VARIABLE name:tmp0_other_with_cast type:C flags:val
-          @0:0..4:1 TYPE_OP type=C origin=IMPLICIT_CAST typeOperand=C
+          @0:0..4:1 TYPE_OP type=C origin=CAST typeOperand=C
             @0:0..4:1 GET_VAR 'value-parameter other: Any?' type=kotlin.Any? origin=null
         @0:0..4:1 WHEN type=kotlin.Unit origin=null
           @0:0..4:1 BRANCH