diff --git a/compiler/frontend/src/org/jetbrains/kotlin/frontend/di/injection.kt b/compiler/frontend/src/org/jetbrains/kotlin/frontend/di/injection.kt index 8358a2a4986..cf6a584460a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/frontend/di/injection.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/frontend/di/injection.kt @@ -28,7 +28,6 @@ import org.jetbrains.kotlin.extensions.StorageComponentContainerContributor import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.resolve.* -import org.jetbrains.kotlin.resolve.calls.tower.CommonSupertypeCalculatorImpl import org.jetbrains.kotlin.resolve.calls.tower.IsDescriptorFromSourcePredicateImpl import org.jetbrains.kotlin.resolve.lazy.* import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactory @@ -62,7 +61,6 @@ fun StorageComponentContainer.configureModule( private fun StorageComponentContainer.configurePlatformIndependentComponents() { useImpl() - useInstance(CommonSupertypeCalculatorImpl) useInstance(IsDescriptorFromSourcePredicateImpl) } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/SpecialComponentImpls.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/SpecialComponentImpls.kt index f386d1a3ca1..c73eba9a583 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/SpecialComponentImpls.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/SpecialComponentImpls.kt @@ -18,14 +18,7 @@ package org.jetbrains.kotlin.resolve.calls.tower import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils -import org.jetbrains.kotlin.resolve.calls.components.CommonSupertypeCalculator import org.jetbrains.kotlin.resolve.calls.components.IsDescriptorFromSourcePredicate -import org.jetbrains.kotlin.types.CommonSupertypes -import org.jetbrains.kotlin.types.UnwrappedType - -object CommonSupertypeCalculatorImpl : CommonSupertypeCalculator { - override fun invoke(p1: Collection): UnwrappedType = CommonSupertypes.commonSupertype(p1).unwrap() -} object IsDescriptorFromSourcePredicateImpl: IsDescriptorFromSourcePredicate { override fun invoke(p1: CallableDescriptor) = DescriptorToSourceUtils.descriptorToDeclaration(p1) != null diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/ExternalComponents.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/ExternalComponents.kt index 3ef8bdf6fea..9eaec0aa5cd 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/ExternalComponents.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/ExternalComponents.kt @@ -23,8 +23,6 @@ import org.jetbrains.kotlin.types.UnwrappedType interface IsDescriptorFromSourcePredicate: (CallableDescriptor) -> Boolean -interface CommonSupertypeCalculator: (Collection) -> UnwrappedType - // This components hold state (trace). Work with this carefully. interface KotlinResolutionCallbacks { fun analyzeAndGetLambdaResultArguments(