From 86a6771a09f443f05230492a391c2239fb53dd09 Mon Sep 17 00:00:00 2001 From: Vasily Levchenko Date: Mon, 19 Dec 2016 12:36:47 +0300 Subject: [PATCH] kotlin-compiler update: 1.1-20161217.025654-317 --- .../kotlin/backend/common/lower/LocalFunctionsLowering.kt | 2 +- .../src/org/jetbrains/kotlin/backend/konan/KonanPlatform.kt | 2 ++ .../kotlin/backend/konan/KonanPlatformConfigurator.kt | 4 +++- .../kotlin/backend/konan/lower/CallableReferenceLowering.kt | 3 +-- gradle.properties | 3 ++- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/lower/LocalFunctionsLowering.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/lower/LocalFunctionsLowering.kt index 843d0dd3fd2..3684503a166 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/lower/LocalFunctionsLowering.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/lower/LocalFunctionsLowering.kt @@ -316,7 +316,7 @@ class LocalFunctionsLowering(val context: BackendContext): DeclarationContainerL valueDescriptor.annotations, suggestNameForCapturedValueParameter(valueDescriptor), valueDescriptor.type, - false, false, false, false, null, valueDescriptor.source + false, false, false, null, valueDescriptor.source ) private fun createUnsubstitutedParameter( diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanPlatform.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanPlatform.kt index cfdf99c100a..af5e3455936 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanPlatform.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanPlatform.kt @@ -18,6 +18,7 @@ package org.jetbrains.kotlin.backend.konan import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.backend.konan.KonanPlatformConfigurator +import org.jetbrains.kotlin.descriptors.PlatformKind import org.jetbrains.kotlin.resolve.ImportPath import org.jetbrains.kotlin.resolve.PlatformConfigurator import org.jetbrains.kotlin.resolve.TargetPlatform @@ -34,6 +35,7 @@ class KonanBuiltIns: KotlinBuiltIns { } object KonanPlatform : TargetPlatform("Konan") { + override val kind = PlatformKind.DEFAULT /* TODO: native */ override val defaultImports: List = Default.defaultImports + listOf( ImportPath("kotlin.*"), ImportPath("kotlin.collections.*"), diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanPlatformConfigurator.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanPlatformConfigurator.kt index ff822379a54..ed9f466f7fe 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanPlatformConfigurator.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanPlatformConfigurator.kt @@ -26,6 +26,7 @@ import org.jetbrains.kotlin.resolve.IdentifierChecker import org.jetbrains.kotlin.resolve.OverloadFilter import org.jetbrains.kotlin.resolve.PlatformConfigurator import org.jetbrains.kotlin.resolve.calls.results.TypeSpecificityComparator +import org.jetbrains.kotlin.resolve.lazy.DelegationFilter import org.jetbrains.kotlin.resolve.scopes.SyntheticConstructorsProvider import org.jetbrains.kotlin.resolve.scopes.SyntheticScopes import org.jetbrains.kotlin.types.DynamicTypesSettings @@ -40,7 +41,8 @@ object KonanPlatformConfigurator : PlatformConfigurator( additionalAnnotationCheckers = listOf(), identifierChecker = IdentifierChecker.DEFAULT, overloadFilter = OverloadFilter.DEFAULT, - platformToKotlinClassMap = PlatformToKotlinClassMap.EMPTY + platformToKotlinClassMap = PlatformToKotlinClassMap.EMPTY, + delegationFilter = DelegationFilter.DEFAULT // TODO: fixme ) { override fun configureModuleComponents(container: StorageComponentContainer) { container.useInstance(SyntheticScopes.Empty) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/CallableReferenceLowering.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/CallableReferenceLowering.kt index 39cfffc3da6..dc187c195e7 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/CallableReferenceLowering.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/CallableReferenceLowering.kt @@ -198,7 +198,6 @@ private class CallableReferencesUnbinder(val lower: CallableReferenceLowering, outType = param.type, declaresDefaultValue = false, isCrossinline = false, isNoinline = false, - isCoroutine = false, varargElementType = (param as? ValueParameterDescriptor)?.varargElementType, source = SourceElement.NO_SOURCE) } @@ -213,7 +212,7 @@ private class CallableReferencesUnbinder(val lower: CallableReferenceLowering, outType = simpleFunctionImplType, declaresDefaultValue = false, isCrossinline = false, isNoinline = false, - isCoroutine = false, varargElementType = null, + varargElementType = null, source = SourceElement.NO_SOURCE) val newValueParameters = listOf(functionParameter) + newUnboundParams diff --git a/gradle.properties b/gradle.properties index 64b0e4071b9..b1284091ba4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,5 @@ #kotlin_version=1.1-M02 kotlin_version=1.1-M03 #kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-20161201.112229-281 -kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-20161209.125829-302 +#kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-20161209.125829-302 +kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-20161217.025654-317