Extract logic of builtins package fragment provider creation

This allows to drop the compile dependency of module 'descriptors' on
'deserialization', breaking the circular dependency between them
This commit is contained in:
Alexander Udalov
2017-06-05 12:40:35 +03:00
parent 1728b77b2c
commit 751ff48301
7 changed files with 72 additions and 17 deletions
@@ -0,0 +1 @@
org.jetbrains.kotlin.builtins.BuiltInsLoaderImpl
@@ -29,7 +29,28 @@ import org.jetbrains.kotlin.serialization.deserialization.*
import org.jetbrains.kotlin.storage.StorageManager
import java.io.InputStream
class BuiltInsLoaderImpl {
class BuiltInsLoaderImpl : BuiltInsLoader {
private val classLoader = this::class.java.classLoader
override fun createPackageFragmentProvider(
storageManager: StorageManager,
builtInsModule: ModuleDescriptor,
classDescriptorFactories: Iterable<ClassDescriptorFactory>,
platformDependentDeclarationFilter: PlatformDependentDeclarationFilter,
additionalClassPartsProvider: AdditionalClassPartsProvider
): PackageFragmentProvider {
return createBuiltInPackageFragmentProvider(
storageManager,
builtInsModule,
KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAMES,
classDescriptorFactories,
platformDependentDeclarationFilter,
additionalClassPartsProvider
) { path ->
classLoader?.getResourceAsStream(path) ?: ClassLoader.getSystemResourceAsStream(path)
}
}
fun createBuiltInPackageFragmentProvider(
storageManager: StorageManager,
module: ModuleDescriptor,