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