From 766876b8a242b9e4f90244745eedec224c7b0ad0 Mon Sep 17 00:00:00 2001
From: Sergej Jaskiewicz <sergej.jaskiewicz@jetbrains.com>
Date: Tue, 19 Dec 2023 16:32:48 +0100
Subject: [PATCH] [K/N] Don't run ManglerChecker in K2 since its checks are
 disabled

KT-60648 is closed as "Declined", thus this code is not needed anymore.
---
 .../kotlin/fir/signaturer/FirMangler.kt       | 41 -------------------
 .../jetbrains/kotlin/backend/konan/Fir2Ir.kt  | 10 -----
 2 files changed, 51 deletions(-)
 delete mode 100644 compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/signaturer/FirMangler.kt

diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/signaturer/FirMangler.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/signaturer/FirMangler.kt
deleted file mode 100644
index 20982dadef9..00000000000
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/signaturer/FirMangler.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.fir.signaturer
-
-import org.jetbrains.kotlin.backend.common.serialization.mangle.AbstractKotlinMangler
-import org.jetbrains.kotlin.backend.common.serialization.mangle.KotlinExportChecker
-import org.jetbrains.kotlin.backend.common.serialization.mangle.KotlinMangleComputer
-import org.jetbrains.kotlin.backend.common.serialization.mangle.MangleMode
-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.declarations.IrDeclaration
-import org.jetbrains.kotlin.ir.declarations.IrMetadataSourceOwner
-import org.jetbrains.kotlin.ir.util.KotlinMangler
-import org.jetbrains.kotlin.utils.addToStdlib.shouldNotBeCalled
-
-class Ir2FirManglerAdapter(private val delegate: FirMangler) : AbstractKotlinMangler<IrDeclaration>(),
-    KotlinMangler.IrMangler {
-    override val manglerName: String
-        get() = delegate.manglerName
-
-    private fun IrDeclaration.fir(): FirDeclaration = ((this as IrMetadataSourceOwner).metadata as FirMetadataSource).fir!!
-
-    override fun IrDeclaration.isExported(compatibleMode: Boolean): Boolean = delegate.run { fir().isExported(compatibleMode) }
-
-    override fun IrDeclaration.mangleString(compatibleMode: Boolean): String {
-        shouldNotBeCalled()
-    }
-
-    override fun IrDeclaration.signatureString(compatibleMode: Boolean): String = delegate.run { fir().signatureString(compatibleMode) }
-
-    override fun getMangleComputer(mode: MangleMode, compatibleMode: Boolean): KotlinMangleComputer<IrDeclaration> =
-        shouldNotBeCalled()
-
-    override fun getExportChecker(compatibleMode: Boolean): KotlinExportChecker<IrDeclaration> {
-        shouldNotBeCalled()
-    }
-}
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Fir2Ir.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Fir2Ir.kt
index 7079e18c80a..ecea02a4ff1 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Fir2Ir.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Fir2Ir.kt
@@ -118,16 +118,6 @@ internal fun PhaseContext.fir2Ir(
             visibilityConverter = Fir2IrVisibilityConverter.Default,
             kotlinBuiltIns = builtInsModule ?: DefaultBuiltIns.Instance,
             actualizerTypeContextProvider = ::IrTypeSystemContextImpl,
-            fir2IrResultPostCompute = { _, irOutput ->
-                // it's important to compare manglers before actualization, since IR will be actualized, while FIR won't
-                irOutput.irModuleFragment.acceptVoid(
-                        ManglerChecker(
-                                KonanManglerIr,
-                                Ir2FirManglerAdapter(FirNativeKotlinMangler),
-                                needsChecking = { false }, // FIXME(KT-60648): Re-enable
-                        )
-                )
-            }
     ).also {
         (it.irModuleFragment.descriptor as? FirModuleDescriptor)?.let { it.allDependencyModules = librariesDescriptors }
     }