IR text tests: Don't dump signature mangled names for IR-based descriptors

^KT-57788

compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.kt

@@ -1,8 +1,5 @@
 // TARGET_BACKEND: JVM
 
-// MUTE_SIGNATURE_COMPARISON_K2: JVM_IR
-// ^ KT-57788: Fix computing mangled names of types with @EnhancedNullability from IR-based declaration descriptors
-
 // FILE: implicitNotNullOnDelegatedImplementation.kt
 interface IFoo {
     fun foo(): String

compiler/testData/ir/irText/classes/kt43217.kt

@@ -1,8 +1,5 @@
 // TARGET_BACKEND: JVM
 
-// MUTE_SIGNATURE_COMPARISON_K2: JVM_IR
-// ^ KT-57788: Fix computing mangled names of types with @EnhancedNullability from IR-based declaration descriptors
-
 // FILE: kt43217.kt
 class A {
     private val b =

compiler/testData/ir/irText/firProblems/ImplicitReceiverStack.kt

@@ -1,13 +1,7 @@
+// TARGET_BACKEND: JVM
 // WITH_STDLIB
 // FULL_JDK
 // JVM_TARGET: 1.8
-// IGNORE_BACKEND: JS_IR
-
-// MUTE_SIGNATURE_COMPARISON_K2: JVM_IR JS_IR NATIVE
-// ^ KT-57788: Fix computing mangled names of types with @EnhancedNullability from IR-based declaration descriptors
-
-// KT-61141: ImplicitReceiverStack & PersistentImplicitReceiverStack miss fake overrides `forEach` & `spliterator`
-// IGNORE_BACKEND: NATIVE
 
 interface SymbolOwner<E : SymbolOwner<E>>
 

compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/IrMangledNameAndSignatureDumpHandler.kt

@@ -15,6 +15,7 @@ import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
 import org.jetbrains.kotlin.descriptors.PropertyDescriptor
 import org.jetbrains.kotlin.fir.backend.FirMangler
 import org.jetbrains.kotlin.fir.backend.FirMetadataSource
+import org.jetbrains.kotlin.fir.declarations.FirDeclaration
 import org.jetbrains.kotlin.ir.IrBuiltIns
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
@@ -226,14 +227,13 @@ class IrMangledNameAndSignatureDumpHandler(
                 addSignatureTo(signatures, symbol.signature, ComputedBy.FE, isPublic = true)
                 addSignatureTo(signatures, symbol.privateSignature, ComputedBy.FE, isPublic = false)
 
-                descriptorMangler.addSignatureMangledNameTo(signatureMangledNames, symbol.descriptor)
+                val firDeclaration: FirDeclaration? = ((declaration as? IrMetadataSourceOwner)?.metadata as? FirMetadataSource)?.fir
-
+                if (firDeclaration != null) {
-                ((declaration as? IrMetadataSourceOwner)?.metadata as? FirMetadataSource)?.fir?.let {
+                    // Dump only FIR-based signature mangled names if there is FIR available. In this mode no descriptors are used
-                    firMangler?.addSignatureMangledNameTo(
+                    // for computing signature mangled names.
-                        signatureMangledNames,
+                    firMangler?.addSignatureMangledNameTo(signatureMangledNames, firDeclaration)
-                        it
+                } else
-                    )
+                    descriptorMangler.addSignatureMangledNameTo(signatureMangledNames, symbol.descriptor)
-                }
             }
 
             fun printActualMangledNamesAndSignatures() {

compiler/tests-gen/org/jetbrains/kotlin/klib/KlibIrTextTestCaseGenerated.java

@@ -2124,11 +2124,6 @@ public class KlibIrTextTestCaseGenerated extends AbstractKlibIrTextTestCase {
             runTest("compiler/testData/ir/irText/firProblems/FirBuilder.kt");
         }
 
-        @TestMetadata("ImplicitReceiverStack.kt")
-        public void testImplicitReceiverStack() throws Exception {
-            runTest("compiler/testData/ir/irText/firProblems/ImplicitReceiverStack.kt");
-        }
-
         @TestMetadata("inapplicableCollectionSet.kt")
         public void testInapplicableCollectionSet() throws Exception {
             runTest("compiler/testData/ir/irText/firProblems/inapplicableCollectionSet.kt");

js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirLightTreeJsIrTextTestGenerated.java

@@ -2386,12 +2386,6 @@ public class FirLightTreeJsIrTextTestGenerated extends AbstractFirLightTreeJsIrT
             runTest("compiler/testData/ir/irText/firProblems/FirBuilder.kt");
         }
 
-        @Test
-        @TestMetadata("ImplicitReceiverStack.kt")
-        public void testImplicitReceiverStack() throws Exception {
-            runTest("compiler/testData/ir/irText/firProblems/ImplicitReceiverStack.kt");
-        }
-
         @Test
         @TestMetadata("inapplicableCollectionSet.kt")
         public void testInapplicableCollectionSet() throws Exception {

js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirPsiJsIrTextTestGenerated.java

@@ -2386,12 +2386,6 @@ public class FirPsiJsIrTextTestGenerated extends AbstractFirPsiJsIrTextTest {
             runTest("compiler/testData/ir/irText/firProblems/FirBuilder.kt");
         }
 
-        @Test
-        @TestMetadata("ImplicitReceiverStack.kt")
-        public void testImplicitReceiverStack() throws Exception {
-            runTest("compiler/testData/ir/irText/firProblems/ImplicitReceiverStack.kt");
-        }
-
         @Test
         @TestMetadata("inapplicableCollectionSet.kt")
         public void testInapplicableCollectionSet() throws Exception {

js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/ClassicJsIrTextTestGenerated.java

@@ -2386,12 +2386,6 @@ public class ClassicJsIrTextTestGenerated extends AbstractClassicJsIrTextTest {
             runTest("compiler/testData/ir/irText/firProblems/FirBuilder.kt");
         }
 
-        @Test
-        @TestMetadata("ImplicitReceiverStack.kt")
-        public void testImplicitReceiverStack() throws Exception {
-            runTest("compiler/testData/ir/irText/firProblems/ImplicitReceiverStack.kt");
-        }
-
         @Test
         @TestMetadata("inapplicableCollectionSet.kt")
         public void testInapplicableCollectionSet() throws Exception {

native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/irtext/ClassicNativeIrTextTestGenerated.java

@@ -2392,12 +2392,6 @@ public class ClassicNativeIrTextTestGenerated extends AbstractClassicNativeIrTex
             runTest("compiler/testData/ir/irText/firProblems/FirBuilder.kt");
         }
 
-        @Test
-        @TestMetadata("ImplicitReceiverStack.kt")
-        public void testImplicitReceiverStack() throws Exception {
-            runTest("compiler/testData/ir/irText/firProblems/ImplicitReceiverStack.kt");
-        }
-
         @Test
         @TestMetadata("inapplicableCollectionSet.kt")
         public void testInapplicableCollectionSet() throws Exception {

native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/irtext/FirLightTreeNativeIrTextTestGenerated.java

@@ -2392,12 +2392,6 @@ public class FirLightTreeNativeIrTextTestGenerated extends AbstractFirLightTreeN
             runTest("compiler/testData/ir/irText/firProblems/FirBuilder.kt");
         }
 
-        @Test
-        @TestMetadata("ImplicitReceiverStack.kt")
-        public void testImplicitReceiverStack() throws Exception {
-            runTest("compiler/testData/ir/irText/firProblems/ImplicitReceiverStack.kt");
-        }
-
         @Test
         @TestMetadata("inapplicableCollectionSet.kt")
         public void testInapplicableCollectionSet() throws Exception {

native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/irtext/FirPsiNativeIrTextTestGenerated.java

@@ -2392,12 +2392,6 @@ public class FirPsiNativeIrTextTestGenerated extends AbstractFirPsiNativeIrTextT
             runTest("compiler/testData/ir/irText/firProblems/FirBuilder.kt");
         }
 
-        @Test
-        @TestMetadata("ImplicitReceiverStack.kt")
-        public void testImplicitReceiverStack() throws Exception {
-            runTest("compiler/testData/ir/irText/firProblems/ImplicitReceiverStack.kt");
-        }
-
         @Test
         @TestMetadata("inapplicableCollectionSet.kt")
         public void testInapplicableCollectionSet() throws Exception {