[FIR2IR] Don't use descriptor manglers in FIR2IR

They don't do anything, only complicate the initial configuration.

KT-64990
This commit is contained in:
Sergej Jaskiewicz
2024-01-15 19:48:34 +01:00
committed by Space Team
parent 8b4cc050eb
commit bc5810ee67
21 changed files with 34 additions and 109 deletions
@@ -133,7 +133,7 @@ class ClassicFrontend2NativeIrConverter(
moduleFragment,
pluginContext,
diagnosticReporter = DiagnosticReporterFactory.createReporter(),
descriptorMangler = (pluginContext.symbolTable as SymbolTable).signaturer.mangler,
descriptorMangler = (pluginContext.symbolTable as SymbolTable).signaturer!!.mangler,
irMangler = KonanManglerIr,
firMangler = null,
)
@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.konan.test
import org.jetbrains.kotlin.KtSourceFile
import org.jetbrains.kotlin.backend.common.serialization.metadata.DynamicTypeDeserializer
import org.jetbrains.kotlin.backend.konan.serialization.KonanManglerDesc
import org.jetbrains.kotlin.backend.konan.serialization.KonanManglerIr
import org.jetbrains.kotlin.builtins.konan.KonanBuiltIns
import org.jetbrains.kotlin.config.CompilerConfiguration
@@ -30,10 +29,6 @@ import org.jetbrains.kotlin.test.services.TestServices
class Fir2IrNativeResultsConverter(testServices: TestServices) : AbstractFir2IrNonJvmResultsConverter(testServices) {
override fun createDescriptorMangler(): KotlinMangler.DescriptorMangler {
return KonanManglerDesc
}
override fun createIrMangler(): KotlinMangler.IrMangler {
return KonanManglerIr
}
@@ -62,7 +57,7 @@ class Fir2IrNativeResultsConverter(testServices: TestServices) : AbstractFir2IrN
fir2IrResult.irModuleFragment,
fir2IrResult.pluginContext,
diagnosticReporter = diagnosticReporter,
descriptorMangler = manglers.descriptorMangler,
descriptorMangler = null,
irMangler = manglers.irMangler,
firMangler = manglers.firMangler,
)