kotlin-compiler update: 1.1-20161217.025654-317

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(

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<ImportPath> = Default.defaultImports + listOf(
             ImportPath("kotlin.*"),
             ImportPath("kotlin.collections.*"),

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)

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

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