azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adapt to change in ExternalDependenciesGenerator

Browse Source
This commit is contained in:
Georgy Bronnikov
2019-11-23 15:02:24 +03:00
committed by Georgy Bronnikov
parent 128d348dd6
commit 40715826ad
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ToplevelPhases.kt
+8 -2
View File
@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.descriptors.konan.isKonanStdlib import org.jetbrains.kotlin.descriptors.konan.isKonanStdlib
import org.jetbrains.kotlin.ir.declarations.IrFile import org.jetbrains.kotlin.ir.declarations.IrFile
import org.jetbrains.kotlin.ir.declarations.IrModuleFragment 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.SymbolTable
import org.jetbrains.kotlin.ir.util.addChild import org.jetbrains.kotlin.ir.util.addChild
import org.jetbrains.kotlin.ir.util.addFile import org.jetbrains.kotlin.ir.util.addFile
@@ -183,8 +184,13 @@ internal val psiToIrPhase = konanUnitPhase(
symbolTable, generatorContext.irBuiltIns, reflectionTypes) symbolTable, generatorContext.irBuiltIns, reflectionTypes)
val irProviderForInteropStubs = IrProviderForInteropStubs() val irProviderForInteropStubs = IrProviderForInteropStubs()
val symbols = KonanSymbols(this, symbolTable, symbolTable.lazyWrapper, functionIrClassFactory) val symbols = KonanSymbols(this, symbolTable, symbolTable.lazyWrapper, functionIrClassFactory)
val module = translator.generateModuleFragment(generatorContext, environment.getSourceFiles(), val stubGenerator = DeclarationStubGenerator(
deserializer, listOf(irProviderForInteropStubs, functionIrClassFactory)) 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) { if (this.stdlibModule in modulesWithoutDCE) {
functionIrClassFactory.buildAllClasses() functionIrClassFactory.buildAllClasses()
build.gradle
+1
View File
@@ -284,6 +284,7 @@ task detectJarCollision(type: CollisionDetector) {
"frontend.common", "frontend.java", "cli-common", "ir.tree", "frontend.common", "frontend.java", "cli-common", "ir.tree",
"ir.psi2ir", "ir.backend.common", "backend.jvm", "backend.js", "ir.psi2ir", "ir.backend.common", "backend.jvm", "backend.js",
"backend.wasm", "ir.serialization.common", "ir.serialization.js", "backend.wasm", "ir.serialization.common", "ir.serialization.js",
"ir.serialization.jvm",
"backend-common", "backend", "plugin-api", "light-classes", "cli", "backend-common", "backend", "plugin-api", "light-classes", "cli",
"cli-js", "incremental-compilation-impl", "js.ast", "js.serializer", "cli-js", "incremental-compilation-impl", "js.ast", "js.serializer",
"js.parser", "js.frontend", "js.translator", "js.dce", "metadata", "js.parser", "js.frontend", "js.translator", "js.dce", "metadata",