From f14a713e4996b4712f8c3372c220f5ae6d63adee Mon Sep 17 00:00:00 2001 From: Sergej Jaskiewicz Date: Thu, 22 Jun 2023 13:06:15 +0200 Subject: [PATCH] [mangling] Remove the unused `fqnString` method from `KotlinMangler` --- .../jetbrains/kotlin/fir/backend/FirBasedKotlinMangler.kt | 2 -- .../src/org/jetbrains/kotlin/fir/signaturer/FirMangler.kt | 2 -- .../src/org/jetbrains/kotlin/ir/util/KotlinMangler.kt | 2 -- .../backend/common/serialization/mangle/ManglerChecker.kt | 7 ------- .../mangle/descriptor/DescriptorBasedKotlinManglerImpl.kt | 4 ---- .../serialization/mangle/ir/IrBasedKotlinManglerImpl.kt | 2 -- .../jvm/serialization/DisabledIdSignatureDescriptor.kt | 3 --- 7 files changed, 22 deletions(-) diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/FirBasedKotlinMangler.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/FirBasedKotlinMangler.kt index 4cde1a1af6f..2aea5df5368 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/FirBasedKotlinMangler.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/FirBasedKotlinMangler.kt @@ -17,8 +17,6 @@ abstract class FirBasedKotlinMangler : AbstractKotlinMangler(), override fun FirDeclaration.signatureString(compatibleMode: Boolean): String = getMangleComputer(MangleMode.SIGNATURE, compatibleMode).computeMangle(this) - override fun FirDeclaration.fqnString(compatibleMode: Boolean): String = getMangleComputer(MangleMode.FQNAME, compatibleMode).computeMangle(this) - override fun FirDeclaration.isExported(compatibleMode: Boolean): Boolean = true override fun getExportChecker(compatibleMode: Boolean): KotlinExportChecker { 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 index cdda6c7dd99..030129f0cee 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/signaturer/FirMangler.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/signaturer/FirMangler.kt @@ -33,8 +33,6 @@ class Ir2FirManglerAdapter(private val delegate: FirMangler) : AbstractKotlinMan override fun IrDeclaration.signatureString(compatibleMode: Boolean): String = delegate.run { fir().signatureString(compatibleMode) } - override fun IrDeclaration.fqnString(compatibleMode: Boolean): String = delegate.run { fir().fqnString(compatibleMode) } - override fun getMangleComputer(mode: MangleMode, compatibleMode: Boolean): KotlinMangleComputer = error("Should not have been reached") diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/KotlinMangler.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/KotlinMangler.kt index ebb847e9637..d5d66036283 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/KotlinMangler.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/KotlinMangler.kt @@ -17,11 +17,9 @@ interface KotlinMangler { fun D.isExported(compatibleMode: Boolean): Boolean fun D.mangleString(compatibleMode: Boolean): String fun D.signatureString(compatibleMode: Boolean): String - fun D.fqnString(compatibleMode: Boolean): String fun D.hashedMangle(compatibleMode: Boolean): Long = mangleString(compatibleMode).hashMangle fun D.signatureMangle(compatibleMode: Boolean): Long = signatureString(compatibleMode).hashMangle - fun D.fqnMangle(compatibleMode: Boolean): Long = fqnString(compatibleMode).hashMangle fun D.isPlatformSpecificExport(): Boolean = false diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/ManglerChecker.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/ManglerChecker.kt index 54ec7e3660a..0ffeebc1808 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/ManglerChecker.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/ManglerChecker.kt @@ -68,9 +68,6 @@ class ManglerChecker( private fun KotlinMangler.signatureMangle(declaration: IrDeclaration) = declaration.signatureString(compatibleMode = false) - private fun KotlinMangler.fqnMangle(declaration: IrDeclaration) = - declaration.fqnString(compatibleMode = false) - private fun Iterable.checkAllEqual(init: R, op: T.() -> R, onError: (T, R, T, R) -> Unit): R { var prev: T? = null @@ -111,10 +108,6 @@ class ManglerChecker( error("SIG: ${declaration.render()}\n ${m1.manglerName}: $r1\n ${m2.manglerName}: $r2\n") } - manglers.checkAllEqual("", { fqnMangle(declaration) }) { m1, r1, m2, r2 -> - error("FQN: ${declaration.render()}\n ${m1.manglerName}: $r1\n ${m2.manglerName}: $r2\n") - } - declaration.acceptChildrenVoid(this) } } \ No newline at end of file diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/descriptor/DescriptorBasedKotlinManglerImpl.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/descriptor/DescriptorBasedKotlinManglerImpl.kt index a7b08904515..596c9ac8546 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/descriptor/DescriptorBasedKotlinManglerImpl.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/descriptor/DescriptorBasedKotlinManglerImpl.kt @@ -27,8 +27,6 @@ abstract class DescriptorBasedKotlinManglerImpl : AbstractKotlinMangler = error("Should not have been reached") diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/ir/IrBasedKotlinManglerImpl.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/ir/IrBasedKotlinManglerImpl.kt index 80bb5a25b9b..20b7f92a154 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/ir/IrBasedKotlinManglerImpl.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/ir/IrBasedKotlinManglerImpl.kt @@ -17,8 +17,6 @@ abstract class IrBasedKotlinManglerImpl : AbstractKotlinMangler() override fun IrDeclaration.signatureString(compatibleMode: Boolean): String = getMangleComputer(MangleMode.SIGNATURE, compatibleMode).computeMangle(this) - override fun IrDeclaration.fqnString(compatibleMode: Boolean): String = getMangleComputer(MangleMode.FQNAME, compatibleMode).computeMangle(this) - override fun IrDeclaration.isExported(compatibleMode: Boolean): Boolean = getExportChecker(compatibleMode).check(this, SpecialDeclarationType.REGULAR) } \ No newline at end of file diff --git a/compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/backend/jvm/serialization/DisabledIdSignatureDescriptor.kt b/compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/backend/jvm/serialization/DisabledIdSignatureDescriptor.kt index 30db5f93074..12f94d83983 100644 --- a/compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/backend/jvm/serialization/DisabledIdSignatureDescriptor.kt +++ b/compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/backend/jvm/serialization/DisabledIdSignatureDescriptor.kt @@ -26,9 +26,6 @@ object DisabledDescriptorMangler : KotlinMangler.DescriptorMangler { override fun DeclarationDescriptor.signatureString(compatibleMode: Boolean): String = error("Should not be called") - override fun DeclarationDescriptor.fqnString(compatibleMode: Boolean): String = - error("Should not be called") - override fun ClassDescriptor.mangleEnumEntryString(compatibleMode: Boolean): String = error("Should not be called")