[IR][JS] Drop JsIrFileSerializer.expectDescriptorToSymbol parameter
^KT-61136
This commit is contained in:
committed by
Space Team
parent
5991364028
commit
b7211c171f
@@ -662,7 +662,7 @@ fun serializeModuleIntoKlib(
|
||||
klibPath: String,
|
||||
dependencies: List<KotlinLibrary>,
|
||||
moduleFragment: IrModuleFragment,
|
||||
expectDescriptorToSymbol: MutableMap<DeclarationDescriptor, IrSymbol>,
|
||||
@Suppress("UNUSED_PARAMETER") expectDescriptorToSymbol: MutableMap<DeclarationDescriptor, IrSymbol>, // TODO: to be removed later
|
||||
cleanFiles: List<KotlinFileSerializedData>,
|
||||
nopack: Boolean,
|
||||
perFile: Boolean,
|
||||
@@ -683,7 +683,6 @@ fun serializeModuleIntoKlib(
|
||||
JsIrModuleSerializer(
|
||||
messageLogger,
|
||||
moduleFragment.irBuiltins,
|
||||
expectDescriptorToSymbol,
|
||||
compatibilityMode,
|
||||
normalizeAbsolutePaths = absolutePathNormalization,
|
||||
sourceBaseDirs = sourceBaseDirs,
|
||||
|
||||
+2
-6
@@ -10,13 +10,11 @@ import org.jetbrains.kotlin.backend.common.serialization.CompatibilityMode
|
||||
import org.jetbrains.kotlin.backend.common.serialization.DeclarationTable
|
||||
import org.jetbrains.kotlin.backend.common.serialization.IrFileSerializer
|
||||
import org.jetbrains.kotlin.config.LanguageVersionSettings
|
||||
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
|
||||
import org.jetbrains.kotlin.ir.declarations.IrAnnotationContainer
|
||||
import org.jetbrains.kotlin.ir.declarations.IrDeclarationWithName
|
||||
import org.jetbrains.kotlin.ir.declarations.IrFile
|
||||
import org.jetbrains.kotlin.ir.expressions.IrConst
|
||||
import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
|
||||
import org.jetbrains.kotlin.ir.symbols.IrSymbol
|
||||
import org.jetbrains.kotlin.ir.util.IrMessageLogger
|
||||
import org.jetbrains.kotlin.ir.util.getAnnotation
|
||||
import org.jetbrains.kotlin.ir.util.hasAnnotation
|
||||
@@ -26,7 +24,6 @@ import org.jetbrains.kotlin.name.FqName
|
||||
class JsIrFileSerializer(
|
||||
messageLogger: IrMessageLogger,
|
||||
declarationTable: DeclarationTable,
|
||||
expectDescriptorToSymbol: MutableMap<DeclarationDescriptor, IrSymbol>,
|
||||
compatibilityMode: CompatibilityMode,
|
||||
languageVersionSettings: LanguageVersionSettings,
|
||||
bodiesOnlyForInlines: Boolean = false,
|
||||
@@ -35,9 +32,8 @@ class JsIrFileSerializer(
|
||||
) : IrFileSerializer(
|
||||
messageLogger,
|
||||
declarationTable,
|
||||
expectDescriptorToSymbol,
|
||||
compatibilityMode,
|
||||
languageVersionSettings,
|
||||
compatibilityMode = compatibilityMode,
|
||||
languageVersionSettings = languageVersionSettings,
|
||||
bodiesOnlyForInlines = bodiesOnlyForInlines,
|
||||
normalizeAbsolutePaths = normalizeAbsolutePaths,
|
||||
sourceBaseDirs = sourceBaseDirs
|
||||
|
||||
-4
@@ -10,16 +10,13 @@ import org.jetbrains.kotlin.backend.common.serialization.DeclarationTable
|
||||
import org.jetbrains.kotlin.backend.common.serialization.IdSignatureClashTracker
|
||||
import org.jetbrains.kotlin.backend.common.serialization.IrModuleSerializer
|
||||
import org.jetbrains.kotlin.config.LanguageVersionSettings
|
||||
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
|
||||
import org.jetbrains.kotlin.ir.IrBuiltIns
|
||||
import org.jetbrains.kotlin.ir.declarations.IrFile
|
||||
import org.jetbrains.kotlin.ir.symbols.IrSymbol
|
||||
import org.jetbrains.kotlin.ir.util.IrMessageLogger
|
||||
|
||||
class JsIrModuleSerializer(
|
||||
messageLogger: IrMessageLogger,
|
||||
irBuiltIns: IrBuiltIns,
|
||||
private val expectDescriptorToSymbol: MutableMap<DeclarationDescriptor, IrSymbol>,
|
||||
compatibilityMode: CompatibilityMode,
|
||||
normalizeAbsolutePaths: Boolean,
|
||||
sourceBaseDirs: Collection<String>,
|
||||
@@ -36,7 +33,6 @@ class JsIrModuleSerializer(
|
||||
JsIrFileSerializer(
|
||||
messageLogger,
|
||||
DeclarationTable(globalDeclarationTable),
|
||||
expectDescriptorToSymbol,
|
||||
compatibilityMode = compatibilityMode,
|
||||
normalizeAbsolutePaths = normalizeAbsolutePaths,
|
||||
sourceBaseDirs = sourceBaseDirs,
|
||||
|
||||
@@ -104,7 +104,7 @@ abstract class AbstractKlibIrTextTestCase : CodegenTestCase() {
|
||||
|
||||
val expected = irModule.dump(DumpIrTreeOptions(stableOrder = true, verboseErrorTypes = false))
|
||||
|
||||
val klibPath = serializeModule(irModule, bindingContext, stdlib, ignoreErrors, expectActualSymbols,)
|
||||
val klibPath = serializeModule(irModule, bindingContext, stdlib, ignoreErrors)
|
||||
val libs = loadKlibFromPath(listOf(runtimeKlibPath, klibPath))
|
||||
val (stdlib2, klib) = libs
|
||||
val deserializedIrModule = deserializeModule(stdlib2, klib)
|
||||
@@ -142,12 +142,11 @@ abstract class AbstractKlibIrTextTestCase : CodegenTestCase() {
|
||||
return serializePackageFragment(moduleDescriptor, memberScope, ktFile.packageFqName)
|
||||
}
|
||||
|
||||
protected fun serializeModule(irModuleFragment: IrModuleFragment, bindingContext: BindingContext, stdlib: KotlinLibrary, containsErrorCode: Boolean, expectActualSymbols: MutableMap<DeclarationDescriptor, IrSymbol>): String {
|
||||
protected fun serializeModule(irModuleFragment: IrModuleFragment, bindingContext: BindingContext, stdlib: KotlinLibrary, containsErrorCode: Boolean): String {
|
||||
val ktFiles = myFiles.psiFiles
|
||||
val serializedIr = JsIrModuleSerializer(
|
||||
IrMessageLogger.None,
|
||||
irModuleFragment.irBuiltins,
|
||||
expectActualSymbols,
|
||||
CompatibilityMode.CURRENT,
|
||||
false,
|
||||
emptyList(),
|
||||
|
||||
@@ -529,7 +529,6 @@ class GenerateIrRuntime {
|
||||
val serializedIr = JsIrModuleSerializer(
|
||||
IrMessageLogger.None,
|
||||
module.irBuiltins,
|
||||
mutableMapOf(),
|
||||
CompatibilityMode.CURRENT,
|
||||
normalizeAbsolutePaths = false,
|
||||
emptyList(),
|
||||
|
||||
Reference in New Issue
Block a user