[kotlin compiler][update] 1.3.50-dev-630

extracted/konan.serializer/src/org/jetbrains/kotlin/resolve/konan/platform/KonanPlatformConfigurator.kt

@@ -1,42 +1,19 @@
 package org.jetbrains.kotlin.resolve.konan.platform
 
-import org.jetbrains.kotlin.builtins.PlatformToKotlinClassMap
 import org.jetbrains.kotlin.container.StorageComponentContainer
-import org.jetbrains.kotlin.container.useInstance
 import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
 import org.jetbrains.kotlin.psi.KtCallableDeclaration
-import org.jetbrains.kotlin.resolve.*
-import org.jetbrains.kotlin.resolve.calls.checkers.ReifiedTypeParameterSubstitutionChecker
-import org.jetbrains.kotlin.resolve.calls.components.SamConversionTransformer
-import org.jetbrains.kotlin.resolve.calls.results.TypeSpecificityComparator
+import org.jetbrains.kotlin.resolve.BindingContext
+import org.jetbrains.kotlin.resolve.PlatformConfiguratorBase
 import org.jetbrains.kotlin.resolve.checkers.ExpectedActualDeclarationChecker
 import org.jetbrains.kotlin.resolve.inline.ReasonableInlineRule
-import org.jetbrains.kotlin.resolve.lazy.DelegationFilter
-import org.jetbrains.kotlin.resolve.scopes.SyntheticScopes
-import org.jetbrains.kotlin.types.DynamicTypesSettings
+import org.jetbrains.kotlin.resolve.jvm.checkers.SuperCallWithDefaultArgumentsChecker
 
 object KonanPlatformConfigurator : PlatformConfiguratorBase(
-        DynamicTypesSettings(),
-        additionalDeclarationCheckers = listOf(ExpectedActualDeclarationChecker()),
-        additionalCallCheckers = listOf(
-                org.jetbrains.kotlin.resolve.jvm.checkers.SuperCallWithDefaultArgumentsChecker(),
-                ReifiedTypeParameterSubstitutionChecker()
-        ),
-        additionalTypeCheckers = listOf(),
-        additionalClassifierUsageCheckers = listOf(),
-        additionalAnnotationCheckers = listOf(),
-        identifierChecker = IdentifierChecker.Default,
-        overloadFilter = OverloadFilter.Default,
-        platformToKotlinClassMap = PlatformToKotlinClassMap.EMPTY,
-        delegationFilter = DelegationFilter.Default,
-        overridesBackwardCompatibilityHelper = OverridesBackwardCompatibilityHelper.Default,
-        declarationReturnTypeSanitizer = DeclarationReturnTypeSanitizer.Default
+    additionalDeclarationCheckers = listOf(ExpectedActualDeclarationChecker()),
+    additionalCallCheckers = listOf(SuperCallWithDefaultArgumentsChecker())
 ) {
     override fun configureModuleComponents(container: StorageComponentContainer) {
-        container.useInstance(SyntheticScopes.Empty)
-        container.useInstance(TypeSpecificityComparator.NONE)
-        container.useInstance(SamConversionTransformer.Empty)
-        container.useInstance(NativeInliningRule)
     }
 }
 

extracted/konan.serializer/src/org/jetbrains/kotlin/resolve/konan/platform/NativePlatformAnalyzerServices.kt

@@ -1,17 +1,19 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
+ */
+
 package org.jetbrains.kotlin.resolve.konan.platform
 
 import org.jetbrains.kotlin.resolve.ImportPath
-import org.jetbrains.kotlin.resolve.MultiTargetPlatform
 import org.jetbrains.kotlin.resolve.PlatformConfigurator
-import org.jetbrains.kotlin.resolve.TargetPlatform
+import org.jetbrains.kotlin.resolve.PlatformDependentAnalyzerServices
 import org.jetbrains.kotlin.storage.StorageManager
 
-object KonanPlatform : TargetPlatform("Konan") {
-
+object NativePlatformAnalyzerServices : PlatformDependentAnalyzerServices() {
     override fun computePlatformSpecificDefaultImports(storageManager: StorageManager, result: MutableList<ImportPath>) {
         result.add(ImportPath.fromString("kotlin.native.*"))
     }
 
-    override val multiTargetPlatform = MultiTargetPlatform.Specific(platformName)
     override val platformConfigurator: PlatformConfigurator = KonanPlatformConfigurator
 }