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

Support additional module descriptor dependencies in klib descriptors

Browse Source
This commit is contained in:
Sergey Igushkin
2020-04-08 00:54:31 +03:00
parent a9dd194383
commit d4a0844a77
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/metadata/KlibResolvedModuleDescriptorsFactory.kt
+2 -1
View File
@@ -29,7 +29,8 @@ interface KlibResolvedModuleDescriptorsFactory {
storageManager: StorageManager, storageManager: StorageManager,
builtIns: KotlinBuiltIns?, builtIns: KotlinBuiltIns?,
languageVersionSettings: LanguageVersionSettings, languageVersionSettings: LanguageVersionSettings,
customAction: ((KotlinLibrary, ModuleDescriptorImpl) -> Unit)? = null customAction: ((KotlinLibrary, ModuleDescriptorImpl) -> Unit)? = null,
additionalDependencyModules: Iterable<ModuleDescriptorImpl>
): KotlinResolvedModuleDescriptors ): KotlinResolvedModuleDescriptors
} }
compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/metadata/impl/KlibResolvedModuleDescriptorsFactoryImpl.kt
+3 -2
View File
@@ -37,7 +37,8 @@ class KlibResolvedModuleDescriptorsFactoryImpl(
storageManager: StorageManager, storageManager: StorageManager,
builtIns: KotlinBuiltIns?, builtIns: KotlinBuiltIns?,
languageVersionSettings: LanguageVersionSettings, languageVersionSettings: LanguageVersionSettings,
customAction: ((KotlinLibrary, ModuleDescriptorImpl) -> Unit)? customAction: ((KotlinLibrary, ModuleDescriptorImpl) -> Unit)?,
additionalDependencyModules: Iterable<ModuleDescriptorImpl>
): KotlinResolvedModuleDescriptors { ): KotlinResolvedModuleDescriptors {
val moduleDescriptors = mutableListOf<ModuleDescriptorImpl>() val moduleDescriptors = mutableListOf<ModuleDescriptorImpl>()
@@ -64,7 +65,7 @@ class KlibResolvedModuleDescriptorsFactoryImpl(
// Set inter-dependencies between module descriptors, add forwarding declarations module. // Set inter-dependencies between module descriptors, add forwarding declarations module.
for (module in moduleDescriptors) { for (module in moduleDescriptors) {
// Yes, just to all of them. // Yes, just to all of them.
module.setDependencies(moduleDescriptors + forwardDeclarationsModule) module.setDependencies(moduleDescriptors + additionalDependencyModules + forwardDeclarationsModule)
} }
return KotlinResolvedModuleDescriptors(moduleDescriptors, forwardDeclarationsModule) return KotlinResolvedModuleDescriptors(moduleDescriptors, forwardDeclarationsModule)