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

psi2ir: Generate external dependencies in a loop

Browse Source 
There are some cases (superclasses, overridden methods, and so on) where
external dependencies generation can require additional external
dependencies.
This commit is contained in:
Dmitry Petrov
2018-05-30 13:07:57 +03:00
parent cb549cba00
commit 8094cb7dc5
14 changed files with 6005 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DependenciesCollector.kt
+2
View File
@@ -34,6 +34,8 @@ class DependenciesCollector {
fun getTopLevelDescriptors(packageFragmentDescriptor: PackageFragmentDescriptor): Collection<DeclarationDescriptor> =
topLevelDescriptors[packageFragmentDescriptor] ?: emptyList()
val isEmpty get() = topLevelDescriptors.isEmpty()
fun collectTopLevelDescriptorsForUnboundSymbols(symbolTable: SymbolTable) {
assert(symbolTable.unboundTypeParameters.isEmpty()) { "Unbound type parameters: ${symbolTable.unboundTypeParameters}" }
assert(symbolTable.unboundValueParameters.isEmpty()) { "Unbound value parameters: ${symbolTable.unboundValueParameters}" }
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/ExternalDependenciesGenerator.kt
+45 -19
View File
@@ -25,33 +25,59 @@ import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns
class ExternalDependenciesGenerator(val symbolTable: SymbolTable, val irBuiltIns: IrBuiltIns) {
private val stubGenerator = DeclarationStubGenerator(symbolTable, IrDeclarationOrigin.IR_EXTERNAL_DECLARATION_STUB)
fun generateUnboundSymbolsAsDependencies(irModule: IrModuleFragment) {
val collector = DependenciesCollector()
collector.collectTopLevelDescriptorsForUnboundSymbols(symbolTable)
collector.dependencyModules.mapTo(irModule.dependencyModules) { moduleDescriptor ->
generateModuleStub(collector, moduleDescriptor)
}
DependencyGenerationTask(irModule).run()
}
private fun generateModuleStub(collector: DependenciesCollector, moduleDescriptor: ModuleDescriptor): IrModuleFragment =
stubGenerator.generateEmptyModuleFragmentStub(moduleDescriptor, irBuiltIns).also { irDependencyModule ->
collector.getPackageFragments(moduleDescriptor)
.mapTo(irDependencyModule.externalPackageFragments) { packageFragmentDescriptor ->
generatePackageStub(packageFragmentDescriptor, collector.getTopLevelDescriptors(packageFragmentDescriptor))
private inner class DependencyGenerationTask(val irModule: IrModuleFragment) {
private val moduleFragments = HashMap<ModuleDescriptor, IrModuleFragment>()
private val packageFragments = HashMap<PackageFragmentDescriptor, IrExternalPackageFragment>()
fun run() {
while (true) {
val collector = DependenciesCollector()
collector.collectTopLevelDescriptorsForUnboundSymbols(symbolTable)
if (collector.isEmpty) break
collector.dependencyModules.mapTo(irModule.dependencyModules) { moduleDescriptor ->
generateModuleStub(collector, moduleDescriptor)
}
}
}
private fun generatePackageStub(
packageFragmentDescriptor: PackageFragmentDescriptor,
topLevelDescriptors: Collection<DeclarationDescriptor>
): IrExternalPackageFragment =
stubGenerator.generateEmptyExternalPackageFragmentStub(packageFragmentDescriptor).also { irExternalPackageFragment ->
topLevelDescriptors.mapTo(irExternalPackageFragment.declarations) {
stubGenerator.generateMemberStub(it)
private fun generateModuleStub(collector: DependenciesCollector, moduleDescriptor: ModuleDescriptor): IrModuleFragment =
getOrCreateModuleFragment(moduleDescriptor).also { irDependencyModule ->
collector.getPackageFragments(moduleDescriptor)
.mapTo(irDependencyModule.externalPackageFragments) { packageFragmentDescriptor ->
generatePackageStub(packageFragmentDescriptor, collector.getTopLevelDescriptors(packageFragmentDescriptor))
}
}
}.patchDeclarationParents()
private fun generatePackageStub(
packageFragmentDescriptor: PackageFragmentDescriptor,
topLevelDescriptors: Collection<DeclarationDescriptor>
): IrExternalPackageFragment =
getOrCreatePackageFragment(packageFragmentDescriptor).also { irExternalPackageFragment ->
topLevelDescriptors.mapTo(irExternalPackageFragment.declarations) {
stubGenerator.generateMemberStub(it)
}
irExternalPackageFragment.patchDeclarationParents()
}
private fun getOrCreateModuleFragment(moduleDescriptor: ModuleDescriptor) =
moduleFragments.getOrPut(moduleDescriptor) {
stubGenerator.generateEmptyModuleFragmentStub(moduleDescriptor, irBuiltIns)
}
private fun getOrCreatePackageFragment(packageFragmentDescriptor: PackageFragmentDescriptor) =
packageFragments.getOrPut(packageFragmentDescriptor) {
stubGenerator.generateEmptyExternalPackageFragmentStub(packageFragmentDescriptor)
}
}
}