From 40715826adac7de9cd666ea354e8040fc7845f00 Mon Sep 17 00:00:00 2001 From: Georgy Bronnikov Date: Sat, 23 Nov 2019 15:02:24 +0300 Subject: [PATCH] Adapt to change in ExternalDependenciesGenerator --- .../jetbrains/kotlin/backend/konan/ToplevelPhases.kt | 10 ++++++++-- build.gradle | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ToplevelPhases.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ToplevelPhases.kt index 0f318df5adf..7880f262823 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ToplevelPhases.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ToplevelPhases.kt @@ -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() diff --git a/build.gradle b/build.gradle index 12c570fa54f..9c6c3404e29 100644 --- a/build.gradle +++ b/build.gradle @@ -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",