azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kotlin-compiler update: 1.1-20161217.025654-317

Browse Source
This commit is contained in:
Vasily Levchenko
2016-12-19 12:36:47 +03:00
parent e8c2fb4f53
commit 86a6771a09
5 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/lower/LocalFunctionsLowering.kt
+1 -1
View File
@@ -316,7 +316,7 @@ class LocalFunctionsLowering(val context: BackendContext): DeclarationContainerL
valueDescriptor.annotations, valueDescriptor.annotations,
suggestNameForCapturedValueParameter(valueDescriptor), suggestNameForCapturedValueParameter(valueDescriptor),
valueDescriptor.type, valueDescriptor.type,
false, false, false, false, null, valueDescriptor.source false, false, false, null, valueDescriptor.source
) )
private fun createUnsubstitutedParameter( private fun createUnsubstitutedParameter(
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanPlatform.kt
+2
View File
@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.backend.konan
import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.backend.konan.KonanPlatformConfigurator import org.jetbrains.kotlin.backend.konan.KonanPlatformConfigurator
import org.jetbrains.kotlin.descriptors.PlatformKind
import org.jetbrains.kotlin.resolve.ImportPath import org.jetbrains.kotlin.resolve.ImportPath
import org.jetbrains.kotlin.resolve.PlatformConfigurator import org.jetbrains.kotlin.resolve.PlatformConfigurator
import org.jetbrains.kotlin.resolve.TargetPlatform import org.jetbrains.kotlin.resolve.TargetPlatform
@@ -34,6 +35,7 @@ class KonanBuiltIns: KotlinBuiltIns {
} }
object KonanPlatform : TargetPlatform("Konan") { object KonanPlatform : TargetPlatform("Konan") {
override val kind = PlatformKind.DEFAULT /* TODO: native */
override val defaultImports: List<ImportPath> = Default.defaultImports + listOf( override val defaultImports: List<ImportPath> = Default.defaultImports + listOf(
ImportPath("kotlin.*"), ImportPath("kotlin.*"),
ImportPath("kotlin.collections.*"), ImportPath("kotlin.collections.*"),
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanPlatformConfigurator.kt
+3 -1
View File
@@ -26,6 +26,7 @@ import org.jetbrains.kotlin.resolve.IdentifierChecker
import org.jetbrains.kotlin.resolve.OverloadFilter import org.jetbrains.kotlin.resolve.OverloadFilter
import org.jetbrains.kotlin.resolve.PlatformConfigurator import org.jetbrains.kotlin.resolve.PlatformConfigurator
import org.jetbrains.kotlin.resolve.calls.results.TypeSpecificityComparator 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.SyntheticConstructorsProvider
import org.jetbrains.kotlin.resolve.scopes.SyntheticScopes import org.jetbrains.kotlin.resolve.scopes.SyntheticScopes
import org.jetbrains.kotlin.types.DynamicTypesSettings import org.jetbrains.kotlin.types.DynamicTypesSettings
@@ -40,7 +41,8 @@ object KonanPlatformConfigurator : PlatformConfigurator(
additionalAnnotationCheckers = listOf(), additionalAnnotationCheckers = listOf(),
identifierChecker = IdentifierChecker.DEFAULT, identifierChecker = IdentifierChecker.DEFAULT,
overloadFilter = OverloadFilter.DEFAULT, overloadFilter = OverloadFilter.DEFAULT,
platformToKotlinClassMap = PlatformToKotlinClassMap.EMPTY platformToKotlinClassMap = PlatformToKotlinClassMap.EMPTY,
delegationFilter = DelegationFilter.DEFAULT // TODO: fixme
) { ) {
override fun configureModuleComponents(container: StorageComponentContainer) { override fun configureModuleComponents(container: StorageComponentContainer) {
container.useInstance(SyntheticScopes.Empty) container.useInstance(SyntheticScopes.Empty)
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/CallableReferenceLowering.kt
+1 -2
View File
@@ -198,7 +198,6 @@ private class CallableReferencesUnbinder(val lower: CallableReferenceLowering,
outType = param.type, outType = param.type,
declaresDefaultValue = false, declaresDefaultValue = false,
isCrossinline = false, isNoinline = false, isCrossinline = false, isNoinline = false,
isCoroutine = false,
varargElementType = (param as? ValueParameterDescriptor)?.varargElementType, varargElementType = (param as? ValueParameterDescriptor)?.varargElementType,
source = SourceElement.NO_SOURCE) source = SourceElement.NO_SOURCE)
} }
@@ -213,7 +212,7 @@ private class CallableReferencesUnbinder(val lower: CallableReferenceLowering,
outType = simpleFunctionImplType, outType = simpleFunctionImplType,
declaresDefaultValue = false, declaresDefaultValue = false,
isCrossinline = false, isNoinline = false, isCrossinline = false, isNoinline = false,
isCoroutine = false, varargElementType = null, varargElementType = null,
source = SourceElement.NO_SOURCE) source = SourceElement.NO_SOURCE)
val newValueParameters = listOf(functionParameter) + newUnboundParams val newValueParameters = listOf(functionParameter) + newUnboundParams
gradle.properties
+2 -1
View File
@@ -1,4 +1,5 @@
#kotlin_version=1.1-M02 #kotlin_version=1.1-M02
kotlin_version=1.1-M03 kotlin_version=1.1-M03
#kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-20161201.112229-281 #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