From 918335e12ec53caaa2a17091371ad0a3b86d14ac Mon Sep 17 00:00:00 2001 From: Sergej Jaskiewicz Date: Thu, 9 Nov 2023 16:24:00 +0100 Subject: [PATCH] [IR] Replace `error("Should not be called")` with `shouldNotBeCalled()` --- .../jetbrains/kotlin/fir/signaturer/FirMangler.kt | 7 ++++--- .../serialization/DisabledIdSignatureDescriptor.kt | 12 +++++------- 2 files changed, 9 insertions(+), 10 deletions(-) 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 24f4e01209b..20982dadef9 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 @@ -15,6 +15,7 @@ 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(), KotlinMangler.IrMangler { @@ -26,15 +27,15 @@ class Ir2FirManglerAdapter(private val delegate: FirMangler) : AbstractKotlinMan override fun IrDeclaration.isExported(compatibleMode: Boolean): Boolean = delegate.run { fir().isExported(compatibleMode) } override fun IrDeclaration.mangleString(compatibleMode: Boolean): String { - error("Should not be called") + shouldNotBeCalled() } override fun IrDeclaration.signatureString(compatibleMode: Boolean): String = delegate.run { fir().signatureString(compatibleMode) } override fun getMangleComputer(mode: MangleMode, compatibleMode: Boolean): KotlinMangleComputer = - error("Should not have been reached") + shouldNotBeCalled() override fun getExportChecker(compatibleMode: Boolean): KotlinExportChecker { - error("Should not be called") + shouldNotBeCalled() } } 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 c065090136f..134af198832 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 @@ -12,16 +12,15 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.PropertyDescriptor import org.jetbrains.kotlin.ir.util.IdSignature import org.jetbrains.kotlin.ir.util.KotlinMangler +import org.jetbrains.kotlin.utils.addToStdlib.shouldNotBeCalled object DisabledDescriptorMangler : KotlinMangler.DescriptorMangler { override val String.hashMangle: Long - get() = error("Should not be called") + get() = shouldNotBeCalled() - override fun DeclarationDescriptor.isExported(compatibleMode: Boolean): Boolean = - error("Should not be called") + override fun DeclarationDescriptor.isExported(compatibleMode: Boolean): Boolean = shouldNotBeCalled() - override fun DeclarationDescriptor.signatureString(compatibleMode: Boolean): String = - error("Should not be called") + override fun DeclarationDescriptor.signatureString(compatibleMode: Boolean): String = shouldNotBeCalled() } object DisabledIdSignatureDescriptor : IdSignatureDescriptor(DisabledDescriptorMangler) { @@ -33,6 +32,5 @@ object DisabledIdSignatureDescriptor : IdSignatureDescriptor(DisabledDescriptorM override fun composeAnonInitSignature(descriptor: ClassDescriptor): IdSignature? = null - override fun createSignatureBuilder(type: SpecialDeclarationType): DescriptorBasedSignatureBuilder = - error("Should not be called") + override fun createSignatureBuilder(type: SpecialDeclarationType): DescriptorBasedSignatureBuilder = shouldNotBeCalled() }