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

backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/TopDownAnalyzerFacadeForKonan.kt

@@ -34,7 +34,7 @@ internal object TopDownAnalyzerFacadeForKonan {
         val config = context.config
         val moduleName = Name.special("<${config.moduleId}>") 
 
-        val projectContext = ProjectContext(config.project)
+        val projectContext = ProjectContext(config.project, "TopDownAnalyzer for Konan")
 
         val module = DefaultDescriptorFactory.createDescriptorAndNewBuiltIns(
                 moduleName, projectContext.storageManager, origin = CurrentKonanModuleOrigin)

backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/injection.kt

@@ -5,16 +5,17 @@
 package org.jetbrains.kotlin.backend.konan
 
 import org.jetbrains.kotlin.config.LanguageVersionSettings
-import org.jetbrains.kotlin.config.TargetPlatformVersion
 import org.jetbrains.kotlin.container.*
 import org.jetbrains.kotlin.context.ModuleContext
 import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
 import org.jetbrains.kotlin.frontend.di.configureModule
+import org.jetbrains.kotlin.platform.konan.KonanPlatforms
 import org.jetbrains.kotlin.resolve.*
-import org.jetbrains.kotlin.resolve.konan.platform.KonanPlatform
+import org.jetbrains.kotlin.resolve.konan.platform.NativePlatformAnalyzerServices
 import org.jetbrains.kotlin.resolve.lazy.KotlinCodeAnalyzer
 import org.jetbrains.kotlin.resolve.lazy.ResolveSession
 import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactory
+import org.jetbrains.kotlin.types.SubstitutingScopeProviderImpl
 
 fun createTopDownAnalyzerProviderForKonan(
         moduleContext: ModuleContext,
@@ -23,15 +24,15 @@ fun createTopDownAnalyzerProviderForKonan(
         languageVersionSettings: LanguageVersionSettings,
         initContainer: StorageComponentContainer.() -> Unit
 ): ComponentProvider {
-    return createContainer("TopDownAnalyzerForKonan", KonanPlatform) {
-        configureModule(moduleContext, KonanPlatform, TargetPlatformVersion.NoVersion, bindingTrace)
+    return createContainer("TopDownAnalyzerForKonan", NativePlatformAnalyzerServices) {
+        configureModule(moduleContext, KonanPlatforms.defaultKonanPlatform, NativePlatformAnalyzerServices, bindingTrace, languageVersionSettings)
 
         useInstance(declarationProviderFactory)
         useImpl<AnnotationResolverImpl>()
 
         CompilerEnvironment.configure(this)
 
-        useInstance(languageVersionSettings)
+        useImpl<SubstitutingScopeProviderImpl>()
         useImpl<ResolveSession>()
         useImpl<LazyTopDownAnalyzer>()
 

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
 }

gradle.properties

@@ -15,14 +15,14 @@
 #
 
 # A version of the Kotlin "toolchain" (compiler, runtime, stdlib etc) used by the build script.
-buildKotlinVersion=1.3.50-dev-526
-buildKotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.50-dev-526,pinned:true/artifacts/content/maven
+buildKotlinVersion=1.3.50-dev-630
+buildKotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.50-dev-630,branch:default:any,pinned:true/artifacts/content/maven
 remoteRoot=konan_tests
-kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.50-dev-560,branch:default:true,pinned:true/artifacts/content/maven
-kotlinVersion=1.3.50-dev-560
-kotlinStdlibRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.50-dev-560,branch:default:true,pinned:true/artifacts/content/maven
-kotlinStdlibVersion=1.3.50-dev-560
-testKotlinCompilerVersion=1.3.50-dev-560
+kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.50-dev-630,branch:default:any,pinned:true/artifacts/content/maven
+kotlinVersion=1.3.50-dev-630
+kotlinStdlibRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.50-dev-630,branch:default:any,pinned:true/artifacts/content/maven
+kotlinStdlibVersion=1.3.50-dev-630
+testKotlinCompilerVersion=1.3.50-dev-630
 konanVersion=1.3.50
 org.gradle.jvmargs='-Dfile.encoding=UTF-8'
 org.gradle.workers.max=4