From 8ce7742e7cdec360e91a2a1c1883b9e2c7ae74b8 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 14 Jul 2017 20:56:30 +0300 Subject: [PATCH] Inject DeserializationConfiguration into JvmBuiltInsPackageFragmentProvider --- .../builtins/jvm/JvmBuiltInsPackageFragmentProvider.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/jvm/JvmBuiltInsPackageFragmentProvider.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/jvm/JvmBuiltInsPackageFragmentProvider.kt index c3257361f49..7eea3582fcd 100644 --- a/core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/jvm/JvmBuiltInsPackageFragmentProvider.kt +++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/jvm/JvmBuiltInsPackageFragmentProvider.kt @@ -24,13 +24,14 @@ class JvmBuiltInsPackageFragmentProvider( moduleDescriptor: ModuleDescriptor, notFoundClasses: NotFoundClasses, additionalClassPartsProvider: AdditionalClassPartsProvider, - platformDependentDeclarationFilter: PlatformDependentDeclarationFilter + platformDependentDeclarationFilter: PlatformDependentDeclarationFilter, + deserializationConfiguration: DeserializationConfiguration ) : AbstractDeserializedPackageFragmentProvider(storageManager, finder, moduleDescriptor) { init { components = DeserializationComponents( storageManager, moduleDescriptor, - DeserializationConfiguration.Default, // TODO + deserializationConfiguration, DeserializedClassDataFinder(this), AnnotationAndConstantLoaderImpl(moduleDescriptor, notFoundClasses, BuiltInSerializerProtocol), this,