[Tests] Use stable order of irFiles in IrPrettyKotlinDumpHandler

Module structure might have different order of irFiles after frontend and after deserialization. However, dumps should be identical, so stable order is applied to filteredIrFiles for dumping. ^KT-58239
JetBrains · Jul 1, 2024 · ba6e668 · ba6e668
1 parent e4547ee
commit ba6e668
Show file tree

Hide file tree

Showing 16 changed files with 159 additions and 167 deletions.
diff --git a/compiler/testData/codegen/box/fir/SamWithReceiverMavenProjectImportHandler.sig.kt.txt b/compiler/testData/codegen/box/fir/SamWithReceiverMavenProjectImportHandler.sig.kt.txt
@@ -44,6 +44,18 @@ abstract class AbstractMavenImportHandler {
 }
 
 // MODULE: main
+// FILE: main.kt
+
+// CHECK JVM_IR:
+//   Mangled name: #box(){}kotlin.String
+//   Public signature: /box|-9347091776561469[0]
+//   Public signature debug description: box(){}kotlin.String
+// CHECK JS_IR JS_IR_ES6 NATIVE:
+//   Mangled name: #box(){}
+//   Public signature: /box|2173511048851971368[0]
+//   Public signature debug description: box(){}
+fun box(): String
+
 // FILE: sam.kt
 
 // CHECK:
@@ -78,14 +90,3 @@ class SamWithReceiverMavenProjectImportHandler : AbstractMavenImportHandler {
 
 }
 
-// FILE: main.kt
-
-// CHECK JVM_IR:
-//   Mangled name: #box(){}kotlin.String
-//   Public signature: /box|-9347091776561469[0]
-//   Public signature debug description: box(){}kotlin.String
-// CHECK JS_IR JS_IR_ES6 NATIVE:
-//   Mangled name: #box(){}
-//   Public signature: /box|2173511048851971368[0]
-//   Public signature debug description: box(){}
-fun box(): String
diff --git a/compiler/testData/ir/irText/declarations/multiplatform/k2/expectClassInherited.kt.txt b/compiler/testData/ir/irText/declarations/multiplatform/k2/expectClassInherited.kt.txt
@@ -1,3 +1,5 @@
+// FILE: common.kt
+
 // FILE: platform.kt
 
 abstract class A {
@@ -26,5 +28,3 @@ open class B : A {
 
 }
 
-// FILE: common.kt
-
diff --git a/compiler/testData/ir/irText/declarations/multiplatform/k2/expectClassInherited.sig.kt.txt b/compiler/testData/ir/irText/declarations/multiplatform/k2/expectClassInherited.sig.kt.txt
@@ -1,3 +1,5 @@
+// FILE: common.kt
+
 // FILE: platform.kt
 
 // CHECK:
@@ -42,5 +44,3 @@ open class B : A {
 
 }
 
-// FILE: common.kt
-
diff --git a/compiler/testData/ir/irText/declarations/multiplatform/k2/expectIntersectionOverride.kt.txt b/compiler/testData/ir/irText/declarations/multiplatform/k2/expectIntersectionOverride.kt.txt
@@ -1,3 +1,21 @@
+// FILE: common.kt
+
+interface I1 {
+  abstract fun f(): String
+
+  abstract val p: Int
+    abstract get
+
+}
+
+interface I2 {
+  abstract fun f(): String
+
+  abstract val p: Int
+    abstract get
+
+}
+
 // FILE: platform.kt
 
 class C : I1, I2 {
@@ -17,21 +35,3 @@ class C : I1, I2 {
 
 }
 
-// FILE: common.kt
-
-interface I1 {
-  abstract fun f(): String
-
-  abstract val p: Int
-    abstract get
-
-}
-
-interface I2 {
-  abstract fun f(): String
-
-  abstract val p: Int
-    abstract get
-
-}
-
diff --git a/...er/testData/ir/irText/declarations/multiplatform/k2/expectIntersectionOverride.sig.kt.txt b/...er/testData/ir/irText/declarations/multiplatform/k2/expectIntersectionOverride.sig.kt.txt
@@ -1,42 +1,3 @@
-// FILE: platform.kt
-
-// CHECK:
-//   Mangled name: C
-//   Public signature: /C|null[0]
-class C : I1, I2 {
-  // CHECK:
-  //   Mangled name: C{}p
-  //   Public signature: /C.p|6715504260787941082[0]
-  //   Public signature debug description: {}p
-  override val p: Int
-    // CHECK JVM_IR:
-    //   Mangled name: C#<get-p>(){}kotlin.Int
-    //   Public signature: /C.p.<get-p>|5329635969197638839[0]
-    //   Public signature debug description: <get-p>(){}kotlin.Int
-    // CHECK JS_IR NATIVE:
-    //   Mangled name: C#<get-p>(){}
-    //   Public signature: /C.p.<get-p>|-1162552463316289847[0]
-    //   Public signature debug description: <get-p>(){}
-    override get
-
-  // CHECK:
-  //   Mangled name: C#<init>(){}
-  //   Public signature: /C.<init>|-5645683436151566731[0]
-  //   Public signature debug description: <init>(){}
-  constructor() /* primary */
-
-  // CHECK JVM_IR:
-  //   Mangled name: C#f(){}kotlin.String
-  //   Public signature: /C.f|9098388873611041001[0]
-  //   Public signature debug description: f(){}kotlin.String
-  // CHECK JS_IR NATIVE:
-  //   Mangled name: C#f(){}
-  //   Public signature: /C.f|5316533450599009716[0]
-  //   Public signature debug description: f(){}
-  override fun f(): String
-
-}
-
 // FILE: common.kt
 
 // CHECK:
@@ -99,4 +60,43 @@ interface I2 {
     //   Public signature debug description: <get-p>(){}
     abstract get
 
-}
+}
+
+// FILE: platform.kt
+
+// CHECK:
+//   Mangled name: C
+//   Public signature: /C|null[0]
+class C : I1, I2 {
+  // CHECK:
+  //   Mangled name: C{}p
+  //   Public signature: /C.p|6715504260787941082[0]
+  //   Public signature debug description: {}p
+  override val p: Int
+    // CHECK JVM_IR:
+    //   Mangled name: C#<get-p>(){}kotlin.Int
+    //   Public signature: /C.p.<get-p>|5329635969197638839[0]
+    //   Public signature debug description: <get-p>(){}kotlin.Int
+    // CHECK JS_IR NATIVE:
+    //   Mangled name: C#<get-p>(){}
+    //   Public signature: /C.p.<get-p>|-1162552463316289847[0]
+    //   Public signature debug description: <get-p>(){}
+    override get
+
+  // CHECK:
+  //   Mangled name: C#<init>(){}
+  //   Public signature: /C.<init>|-5645683436151566731[0]
+  //   Public signature debug description: <init>(){}
+  constructor() /* primary */
+
+  // CHECK JVM_IR:
+  //   Mangled name: C#f(){}kotlin.String
+  //   Public signature: /C.f|9098388873611041001[0]
+  //   Public signature debug description: f(){}kotlin.String
+  // CHECK JS_IR NATIVE:
+  //   Mangled name: C#f(){}
+  //   Public signature: /C.f|5316533450599009716[0]
+  //   Public signature debug description: f(){}
+  override fun f(): String
+
+}
diff --git a/...iler/testData/ir/irText/declarations/multiplatform/k2/expectMemberInNotExpectClass.kt.txt b/...iler/testData/ir/irText/declarations/multiplatform/k2/expectMemberInNotExpectClass.kt.txt
@@ -1,3 +1,14 @@
+// FILE: common.kt
+
+class C2 : C1 {
+  constructor() /* primary */ {
+    super/*C1*/()
+    /* <init>() */
+
+  }
+
+}
+
 // FILE: platform.kt
 
 open class C1 {
@@ -17,14 +28,3 @@ open class C1 {
 
 }
 
-// FILE: common.kt
-
-class C2 : C1 {
-  constructor() /* primary */ {
-    super/*C1*/()
-    /* <init>() */
-
-  }
-
-}
-
diff --git a/.../testData/ir/irText/declarations/multiplatform/k2/expectMemberInNotExpectClass.sig.kt.txt b/.../testData/ir/irText/declarations/multiplatform/k2/expectMemberInNotExpectClass.sig.kt.txt
@@ -1,46 +1,3 @@
-// FILE: platform.kt
-
-// CHECK:
-//   Mangled name: C1
-//   Public signature: /C1|null[0]
-open class C1 {
-  // CHECK:
-  //   Mangled name: C1{}p
-  //   Public signature: /C1.p|6715504260787941082[0]
-  //   Public signature debug description: {}p
-  val p: Int
-    // CHECK JVM_IR:
-    //   Mangled name: C1#<get-p>(){}kotlin.Int
-    //   Public signature: /C1.p.<get-p>|5329635969197638839[0]
-    //   Public signature debug description: <get-p>(){}kotlin.Int
-    // CHECK JS_IR NATIVE:
-    //   Mangled name: C1#<get-p>(){}
-    //   Public signature: /C1.p.<get-p>|-1162552463316289847[0]
-    //   Public signature debug description: <get-p>(){}
-    get
-
-  // CHECK JVM_IR:
-  //   Mangled name: C1#<init>(){}
-  //   Public signature: /C1.<init>|-5645683436151566731[0]
-  //   Public signature debug description: <init>(){}
-  // CHECK JS_IR NATIVE:
-  //   Mangled name: C1#<init>(){}
-  //   Public signature: /C1.<init>|-5645683436151566731[0]
-  //   Public signature debug description: <init>(){}
-  constructor() /* primary */
-
-  // CHECK JVM_IR:
-  //   Mangled name: C1#f(){}kotlin.String
-  //   Public signature: /C1.f|9098388873611041001[0]
-  //   Public signature debug description: f(){}kotlin.String
-  // CHECK JS_IR NATIVE:
-  //   Mangled name: C1#f(){}
-  //   Public signature: /C1.f|5316533450599009716[0]
-  //   Public signature debug description: f(){}
-  fun f(): String
-
-}
-
 // FILE: common.kt
 
 // CHECK:
@@ -80,3 +37,41 @@ class C2 : C1 {
 
 }
 
+// FILE: platform.kt
+
+// CHECK:
+//   Mangled name: C1
+//   Public signature: /C1|null[0]
+open class C1 {
+  // CHECK:
+  //   Mangled name: C1{}p
+  //   Public signature: /C1.p|6715504260787941082[0]
+  //   Public signature debug description: {}p
+  val p: Int
+    // CHECK JVM_IR:
+    //   Mangled name: C1#<get-p>(){}kotlin.Int
+    //   Public signature: /C1.p.<get-p>|5329635969197638839[0]
+    //   Public signature debug description: <get-p>(){}kotlin.Int
+    // CHECK JS_IR NATIVE:
+    //   Mangled name: C1#<get-p>(){}
+    //   Public signature: /C1.p.<get-p>|-1162552463316289847[0]
+    //   Public signature debug description: <get-p>(){}
+    get
+
+  // CHECK:
+  //   Mangled name: C1#<init>(){}
+  //   Public signature: /C1.<init>|-5645683436151566731[0]
+  //   Public signature debug description: <init>(){}
+  constructor() /* primary */
+
+  // CHECK JVM_IR:
+  //   Mangled name: C1#f(){}kotlin.String
+  //   Public signature: /C1.f|9098388873611041001[0]
+  //   Public signature debug description: f(){}kotlin.String
+  // CHECK JS_IR NATIVE:
+  //   Mangled name: C1#f(){}
+  //   Public signature: /C1.f|5316533450599009716[0]
+  //   Public signature debug description: f(){}
+  fun f(): String
+
+}
diff --git a/compiler/testData/ir/irText/declarations/multiplatform/k2/expectedEnumClass.kt.txt b/compiler/testData/ir/irText/declarations/multiplatform/k2/expectedEnumClass.kt.txt
@@ -1,3 +1,5 @@
+// FILE: lib.kt
+
 // FILE: main.kt
 
 enum class MyEnum : Enum<MyEnum> {
@@ -22,5 +24,3 @@ enum class MyEnum : Enum<MyEnum> {
 
 }
 
-// FILE: lib.kt
-
diff --git a/compiler/testData/ir/irText/declarations/multiplatform/k2/expectedEnumClass.sig.kt.txt b/compiler/testData/ir/irText/declarations/multiplatform/k2/expectedEnumClass.sig.kt.txt
@@ -1,3 +1,5 @@
+// FILE: lib.kt
+
 // FILE: main.kt
 
 // CHECK:
@@ -131,6 +133,3 @@ enum class MyEnum : Enum<MyEnum> {
     /* fake */ override get(): Int
 
 }
-
-// FILE: lib.kt
-
diff --git a/compiler/testData/ir/irText/declarations/multiplatform/k2/expectedSealedClass.kt.txt b/compiler/testData/ir/irText/declarations/multiplatform/k2/expectedSealedClass.kt.txt
@@ -1,3 +1,5 @@
+// FILE: common.kt
+
 // FILE: platform.kt
 
 class Add : Ops {
@@ -18,5 +20,3 @@ sealed class Ops {
 
 }
 
-// FILE: common.kt
-
diff --git a/compiler/testData/ir/irText/declarations/multiplatform/k2/expectedSealedClass.sig.kt.txt b/compiler/testData/ir/irText/declarations/multiplatform/k2/expectedSealedClass.sig.kt.txt
@@ -1,3 +1,5 @@
+// FILE: common.kt
+
 // FILE: platform.kt
 
 // CHECK:
@@ -23,6 +25,3 @@ sealed class Ops {
   protected constructor() /* primary */
 
 }
-
-// FILE: common.kt
-
diff --git a/compiler/testData/ir/irText/firProblems/TypeAliasInImport.kt.txt b/compiler/testData/ir/irText/firProblems/TypeAliasInImport.kt.txt
@@ -1,3 +1,13 @@
+// FILE: a.kt
+package a
+
+fun test() {
+  Obj.method()
+  Obj.<get-prop>() /*~> Unit */
+  Obj.method()
+  Obj.<get-prop>() /*~> Unit */
+}
+
 // FILE: b.kt
 package b
 
@@ -18,12 +28,3 @@ object Obj {
 }
 
 typealias ObjTA = Obj
-// FILE: a.kt
-package a
-
-fun test() {
-  Obj.method()
-  Obj.<get-prop>() /*~> Unit */
-  Obj.method()
-  Obj.<get-prop>() /*~> Unit */
-}