From eeea4fc1016327c659cdab9d5aaecf4c87f1c820 Mon Sep 17 00:00:00 2001 From: Vasily Levchenko Date: Tue, 31 Jan 2017 11:58:37 +0300 Subject: [PATCH] compiler: 1.1-20170131.025158-393 --- .../kotlin/backend/common/lower/LocalDeclarationsLowering.kt | 3 ++- .../jetbrains/kotlin/backend/konan/lower/EnumClassLowering.kt | 2 +- gradle.properties | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt index e7cf1b20da8..906805305b3 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt @@ -519,7 +519,8 @@ class LocalDeclarationsLowering(val context: BackendContext): DeclarationContain /* isConst = */ false, /* isHeader = */ false, /* isImpl = */ false, - /* isExternal = */ false) + /* isExternal = */ false, + /* isDelegated = */ false) fieldDescriptor.initialize(/* getter = */ null, /* setter = */ null) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/EnumClassLowering.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/EnumClassLowering.kt index 2bc15f31714..5cf1eb82631 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/EnumClassLowering.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/EnumClassLowering.kt @@ -303,7 +303,7 @@ internal class EnumClassLowering(val context: Context) : ClassLoweringPass { val receiver = ReceiverParameterDescriptorImpl(implObjectDescriptor, ImplicitClassReceiver(implObjectDescriptor)) return PropertyDescriptorImpl.create(implObjectDescriptor, Annotations.EMPTY, Modality.FINAL, Visibilities.PRIVATE, false, "VALUES".synthesizedName, CallableMemberDescriptor.Kind.SYNTHESIZED, irClass.descriptor.source, - false, false, false, false, false).initialize(valuesArrayType, dispatchReceiverParameter = receiver) + false, false, false, false, false, false).initialize(valuesArrayType, dispatchReceiverParameter = receiver) } private val kotlinPackage = context.irModule!!.descriptor.getPackage(FqName("kotlin")) diff --git a/gradle.properties b/gradle.properties index 3c7a7e2ed50..b596dba59bc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ kotlin_version=1.1-M03 #kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-SNAPSHOT -kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-20170120.135555-375 +kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-20170131.025158-393