Adapt to change in ExternalDependenciesGenerator
This commit is contained in:
committed by
Georgy Bronnikov
parent
128d348dd6
commit
40715826ad
+8
-2
@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.descriptors.ModuleDescriptor
|
||||
import org.jetbrains.kotlin.descriptors.konan.isKonanStdlib
|
||||
import org.jetbrains.kotlin.ir.declarations.IrFile
|
||||
import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
|
||||
import org.jetbrains.kotlin.ir.util.DeclarationStubGenerator
|
||||
import org.jetbrains.kotlin.ir.util.SymbolTable
|
||||
import org.jetbrains.kotlin.ir.util.addChild
|
||||
import org.jetbrains.kotlin.ir.util.addFile
|
||||
@@ -183,8 +184,13 @@ internal val psiToIrPhase = konanUnitPhase(
|
||||
symbolTable, generatorContext.irBuiltIns, reflectionTypes)
|
||||
val irProviderForInteropStubs = IrProviderForInteropStubs()
|
||||
val symbols = KonanSymbols(this, symbolTable, symbolTable.lazyWrapper, functionIrClassFactory)
|
||||
val module = translator.generateModuleFragment(generatorContext, environment.getSourceFiles(),
|
||||
deserializer, listOf(irProviderForInteropStubs, functionIrClassFactory))
|
||||
val stubGenerator = DeclarationStubGenerator(
|
||||
moduleDescriptor, symbolTable,
|
||||
config.configuration.languageVersionSettings
|
||||
)
|
||||
val irProviders = listOf(irProviderForInteropStubs, functionIrClassFactory, deserializer, stubGenerator)
|
||||
stubGenerator.setIrProviders(irProviders)
|
||||
val module = translator.generateModuleFragment(generatorContext, environment.getSourceFiles(), irProviders)
|
||||
|
||||
if (this.stdlibModule in modulesWithoutDCE) {
|
||||
functionIrClassFactory.buildAllClasses()
|
||||
|
||||
@@ -284,6 +284,7 @@ task detectJarCollision(type: CollisionDetector) {
|
||||
"frontend.common", "frontend.java", "cli-common", "ir.tree",
|
||||
"ir.psi2ir", "ir.backend.common", "backend.jvm", "backend.js",
|
||||
"backend.wasm", "ir.serialization.common", "ir.serialization.js",
|
||||
"ir.serialization.jvm",
|
||||
"backend-common", "backend", "plugin-api", "light-classes", "cli",
|
||||
"cli-js", "incremental-compilation-impl", "js.ast", "js.serializer",
|
||||
"js.parser", "js.frontend", "js.translator", "js.dce", "metadata",
|
||||
|
||||
Reference in New Issue
Block a user