Factor out duplicated mangling logic for functions into the base class

^KT-57777 Fixed
^KT-57818 Fixed

compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.kt

@@ -1,9 +1,6 @@
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 
-// MUTE_SIGNATURE_COMPARISON_K2: ANY
-// ^ KT-57777
-
 annotation class TestAnn(val x: String)
 
 @TestAnn("class")

compiler/testData/ir/irText/declarations/annotations/constExpressionsInAnnotationArguments.kt

@@ -1,9 +1,5 @@
 // FIR_IDENTICAL
 
-// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
-// MUTE_SIGNATURE_COMPARISON_K2: NATIVE
-// ^ KT-57818
-
 const val ONE = 1
 
 annotation class A(val x: Int)

compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.kt

@@ -1,7 +1,3 @@
-// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
-// MUTE_SIGNATURE_COMPARISON_K2: NATIVE
-// ^ KT-57818
-
 annotation class A(val x: String)
 
 class Cell(var value: Int) {

compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.kt

@@ -1,9 +1,6 @@
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 
-// MUTE_SIGNATURE_COMPARISON_K2: ANY
-// ^ KT-57777
-
 enum class En { A, B, C, D }
 
 annotation class TestAnn(val x: En)

compiler/testData/ir/irText/declarations/annotations/fieldsWithAnnotations.kt

@@ -1,9 +1,5 @@
 // FIR_IDENTICAL
 
-// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
-// MUTE_SIGNATURE_COMPARISON_K2: NATIVE
-// ^ KT-57818
-
 annotation class TestAnn(val x: String)
 
 @field:TestAnn("testVal.field")

compiler/testData/ir/irText/declarations/annotations/propertiesWithAnnotations.kt

@@ -1,9 +1,5 @@
 // FIR_IDENTICAL
 
-// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
-// MUTE_SIGNATURE_COMPARISON_K2: NATIVE
-// ^ KT-57818
-
 annotation class TestAnn(val x: String)
 
 @TestAnn("testVal.property")

compiler/testData/ir/irText/declarations/annotations/propertyAccessorsWithAnnotations.kt

@@ -1,9 +1,5 @@
 // FIR_IDENTICAL
 
-// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
-// MUTE_SIGNATURE_COMPARISON_K2: NATIVE
-// ^ KT-57818
-
 annotation class TestAnn(val x: String)
 
 val test1: String

compiler/testData/ir/irText/declarations/annotations/propertySetterParameterWithAnnotations.kt

@@ -1,9 +1,5 @@
 // FIR_IDENTICAL
 
-// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
-// MUTE_SIGNATURE_COMPARISON_K2: NATIVE
-// ^ KT-57818
-
 annotation class AnnParam
 
 @setparam:AnnParam

compiler/testData/ir/irText/declarations/annotations/receiverParameterWithAnnotations.kt

@@ -1,9 +1,5 @@
 // FIR_IDENTICAL
 
-// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
-// MUTE_SIGNATURE_COMPARISON_K2: NATIVE
-// ^ KT-57818
-
 annotation class Ann
 
 class A {

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

@@ -1,7 +1,3 @@
 // FIR_IDENTICAL
 
-// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
-// MUTE_SIGNATURE_COMPARISON_K2: NATIVE
-// ^ KT-57818
-
 val test = try { } catch (e : Throwable) { }

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

@@ -1,9 +1,5 @@
 // FIR_IDENTICAL
 
-// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
-// MUTE_SIGNATURE_COMPARISON_K2: NATIVE
-// ^ KT-57818
-
 const val I0 = 0
 const val I1 = 1
 const val I2 = I0 + I1 + I1

compiler/testData/ir/irText/declarations/contextReceivers/property.kt

@@ -1,9 +1,6 @@
 // FIR_IDENTICAL
 // !LANGUAGE: +ContextReceivers
 
-// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
-// ^ KT-57818
-
 interface A {
     fun a(): Int
 }

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

@@ -1,9 +1,5 @@
 // FIR_IDENTICAL
 
-// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
-// MUTE_SIGNATURE_COMPARISON_K2: NATIVE
-// ^ KT-57818
-
 @Deprecated("")
 val testVal = 1
 

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

@@ -1,9 +1,5 @@
 // FIR_IDENTICAL
 
-// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
-// MUTE_SIGNATURE_COMPARISON_K2: NATIVE
-// ^ KT-57818
-
 val String.test1 get() = 42
 
 var String.test2

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

@@ -1,6 +1,3 @@
-// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
-// ^ KT-57818
-
 class C<T>
 
 object Delegate {

compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass2.kt

@@ -4,9 +4,6 @@
 // IGNORE_BACKEND_K2: JS_IR
 // IGNORE_BACKEND_K2: JS_IR_ES6
 
-// MUTE_SIGNATURE_COMPARISON_K2: ANY
-// ^ KT-57777
-
 // MODULE: lib
 // FILE: lib.kt
 expect enum class MyEnum {

compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass2.sig.kt.txt

@@ -1,7 +1,93 @@
-// FILE: main.kt
+// MODULE: <lib>
+// FILE: lib.kt
 
 // CHECK:
 //   Mangled name: MyEnum
+//   Public signature: /MyEnum|null[1]
+expect enum class MyEnum : Enum<MyEnum> {
+  // CHECK:
+  //   Mangled name: MyEnum#<init>(){}
+  //   Public signature: /MyEnum.<init>|-5645683436151566731[1]
+  private expect constructor() /* primary */
+  // CHECK:
+  //   Mangled name: MyEnum.BAR
+  //   Public signature: /MyEnum.BAR|null[1]
+  BAR
+
+  // CHECK:
+  //   Mangled name: MyEnum.FOO
+  //   Public signature: /MyEnum.FOO|null[1]
+  FOO
+
+  // CHECK:
+  //   Mangled name: MyEnum#valueOf#static(kotlin.String){}MyEnum
+  //   Public signature: /MyEnum.valueOf|4316550590519800984[1]
+  expect fun valueOf(value: String): MyEnum
+
+  // CHECK JVM_IR:
+  //   Mangled name: MyEnum#values#static(){}kotlin.Array<MyEnum>
+  //   Public signature: /MyEnum.values|3097625172661156808[1]
+  expect fun values(): Array<MyEnum>
+
+  // CHECK JVM_IR:
+  //   Mangled name: MyEnum#clone(){}kotlin.Any
+  //   Public signature: /MyEnum.clone|-6903128697527593263[1]
+  protected expect /* fake */ override fun clone(): Any
+
+  // CHECK JVM_IR:
+  //   Mangled name: MyEnum#compareTo(MyEnum){}kotlin.Int
+  //   Public signature: /MyEnum.compareTo|2015858924903177055[1]
+  expect /* fake */ override operator fun compareTo(other: MyEnum): Int
+
+  // CHECK JVM_IR:
+  //   Mangled name: MyEnum#equals(kotlin.Any?){}kotlin.Boolean
+  //   Public signature: /MyEnum.equals|722809408929142791[1]
+  expect /* fake */ override operator fun equals(other: Any?): Boolean
+
+  // CHECK JVM_IR:
+  //   Mangled name: MyEnum#hashCode(){}kotlin.Int
+  //   Public signature: /MyEnum.hashCode|-8048879360829830756[1]
+  expect /* fake */ override fun hashCode(): Int
+
+  // CHECK JVM_IR:
+  //   Mangled name: MyEnum#toString(){}kotlin.String
+  //   Public signature: /MyEnum.toString|6958853723545266802[1]
+  expect /* fake */ override fun toString(): String
+
+  // CHECK JVM_IR:
+  //   Mangled name: MyEnum#static{}entries
+  //   Public signature: /MyEnum.entries|-5134227801081826149[1]
+  expect val entries: EnumEntries<MyEnum>
+    // CHECK:
+    //   Mangled name: MyEnum#<get-entries>#static(){}kotlin.enums.EnumEntries<MyEnum>
+    //   Public signature: /MyEnum.entries.<get-entries>|-3922959509726908718[1]
+    get(): EnumEntries<MyEnum>
+
+  // CHECK JVM_IR:
+  //   Mangled name: MyEnum{}name
+  //   Public signature: /MyEnum.name|4231860309499509769[1]
+  expect /* fake */ override val name: String
+    // CHECK:
+    //   Mangled name: MyEnum#<get-name>(){}kotlin.String
+    //   Public signature: /MyEnum.name.<get-name>|-8006111524522882650[1]
+    /* fake */ override get(): String
+
+  // CHECK JVM_IR:
+  //   Mangled name: MyEnum{}ordinal
+  //   Public signature: /MyEnum.ordinal|1912745122988592376[1]
+  expect /* fake */ override val ordinal: Int
+    // CHECK:
+    //   Mangled name: MyEnum#<get-ordinal>(){}kotlin.Int
+    //   Public signature: /MyEnum.ordinal.<get-ordinal>|-6902664390061762634[1]
+    /* fake */ override get(): Int
+
+}
+
+// MODULE: main
+// FILE: main.kt
+
+// CHECK JVM_IR:
+//   Mangled name: MyEnum
 //   Public signature: /MyEnum|null[0]
 enum class MyEnum : Enum<MyEnum> {
   // CHECK:
@@ -46,7 +132,7 @@ enum class MyEnum : Enum<MyEnum> {
   // CHECK JVM_IR:
   //   Mangled name: MyEnum#equals(kotlin.Any?){}kotlin.Boolean
   //   Public signature: /MyEnum.equals|722809408929142791[0]
-  /* fake */ override fun equals(other: Any?): Boolean
+  /* fake */ override operator fun equals(other: Any?): Boolean
 
   // CHECK JVM_IR:
   //   Mangled name: MyEnum#hashCode(){}kotlin.Int

compiler/testData/ir/irText/declarations/parameters/defaultPropertyAccessors.kt

@@ -1,6 +1,6 @@
 // FIR_IDENTICAL
 
-// MUTE_SIGNATURE_COMPARISON_K2: ANY
+// MUTE_SIGNATURE_COMPARISON_K2: JVM_IR
 // ^ KT-57429
 
 val test1 = 42

compiler/testData/ir/irText/declarations/parameters/lambdas.kt

@@ -1,7 +1,3 @@
-// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
-// MUTE_SIGNATURE_COMPARISON_K2: NATIVE
-// ^ KT-57818
-
 val test1 : (String) -> String = { it }
 val test2 : Any.(Any) -> Any = { it.hashCode() }
 val test3 = { i: Int, j: Int -> }

compiler/testData/ir/irText/declarations/parameters/propertyAccessors.kt

@@ -1,8 +1,5 @@
 // FIR_IDENTICAL
 
-// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
-// ^ KT-57818
-
 val test1 get() = 42
 
 var test2 get() = 42; set(value) {}

compiler/testData/ir/irText/declarations/parameters/typeParameterBeforeBound.kt

@@ -1,8 +1,5 @@
 // FIR_IDENTICAL
 
-// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
-// ^ KT-57818
-
 class Test1<T : U, U>
 
 fun <T : U, U> test2() {}

compiler/testData/ir/irText/declarations/provideDelegate/differentReceivers.kt

@@ -1,10 +1,6 @@
 // FIR_IDENTICAL
 // WITH_STDLIB
 
-// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
-// MUTE_SIGNATURE_COMPARISON_K2: NATIVE
-// ^ KT-57818
-
 class MyClass(val value: String)
 
 operator fun MyClass.provideDelegate(host: Any?, p: Any): String =

compiler/testData/ir/irText/declarations/provideDelegate/topLevel.kt

@@ -1,9 +1,5 @@
 // FIR_IDENTICAL
 
-// MUTE_SIGNATURE_COMPARISON_K2: JS_IR
-// MUTE_SIGNATURE_COMPARISON_K2: NATIVE
-// ^ KT-57818
-
 class Delegate(val value: String) {
     operator fun getValue(thisRef: Any?, property: Any?) = value
 }