From 1d26d3052178acce3a4031b257711988682c26d7 Mon Sep 17 00:00:00 2001
From: Vasily Levchenko <vasily.levchenko@jetbrains.com>
Date: Mon, 18 Sep 2017 08:51:54 +0300
Subject: [PATCH] [kotlin compiler][update] 1.1-20170916.214502-895

gradle-plugin: 1.1-20170916.215405-873
stdlib: 1.1-20170916.214349-804
---
 .../src/org/jetbrains/kotlin/backend/konan/KonanPlatform.kt | 2 +-
 .../konan/serialization/KonanDescriptorSerializer.kt        | 6 +++---
 gradle.properties                                           | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

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 22eb44be8ab..e6a6046b541 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
@@ -73,7 +73,7 @@ class KonanBuiltIns(storageManager: StorageManager) : KotlinBuiltIns(storageMana
 object KonanPlatform : TargetPlatform("Konan") {
     override val multiTargetPlatform = MultiTargetPlatform.Specific(platformName)
     override fun getDefaultImports(includeKotlinComparisons: Boolean): List<ImportPath> {
-       return Default.getDefaultImports(includeKotlinComparisons) + listOf(
+       return Common.getDefaultImports(includeKotlinComparisons) + listOf(
                 ImportPath.fromString("konan.*")
         )
     }
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanDescriptorSerializer.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanDescriptorSerializer.kt
index b20884471e0..89ba7736706 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanDescriptorSerializer.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanDescriptorSerializer.kt
@@ -69,7 +69,7 @@ class KonanDescriptorSerializer private constructor(
         val flags = Flags.getClassFlags(
                 hasAnnotations(classDescriptor), classDescriptor.visibility, classDescriptor.modality, classDescriptor.kind,
                 classDescriptor.isInner, classDescriptor.isCompanionObject, classDescriptor.isData, classDescriptor.isExternal,
-                classDescriptor.isHeader
+                classDescriptor.isExpect
         )
         if (flags != builder.flags) {
             builder.flags = flags
@@ -192,7 +192,7 @@ class KonanDescriptorSerializer private constructor(
         val flags = Flags.getPropertyFlags(
                 hasAnnotations, descriptor.visibility, descriptor.modality, descriptor.kind, descriptor.isVar,
                 hasGetter, hasSetter, hasConstant, isConst, lateInit, descriptor.isExternal,
-                @Suppress("DEPRECATION") descriptor.isDelegated, descriptor.isHeader
+                @Suppress("DEPRECATION") descriptor.isDelegated, descriptor.isExpect
         )
         if (flags != builder.flags) {
             builder.flags = flags
@@ -249,7 +249,7 @@ class KonanDescriptorSerializer private constructor(
         val flags = Flags.getFunctionFlags(
                 hasAnnotations(descriptor), descriptor.visibility, descriptor.modality, descriptor.kind, descriptor.isOperator,
                 descriptor.isInfix, descriptor.isInline, descriptor.isTailrec, descriptor.isExternal, descriptor.isSuspend,
-                descriptor.isHeader
+                descriptor.isExpect
         )
         if (flags != builder.flags) {
             builder.flags = flags
diff --git a/gradle.properties b/gradle.properties
index 2371ba7351f..245083ea2fb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -23,11 +23,11 @@ testDataVersion=1067176:id
 kotlinCompilerRepo=https://dl.bintray.com/jetbrains/kotlin-native-dependencies
 #kotlinCompilerRepo=http://oss.sonatype.org/content/repositories/snapshots
 #kotlinCompilerRepo=http://dl.bintray.com/kotlin/kotlin-dev
-kotlinVersion=1.1-20170909.122859-856
+kotlinVersion=1.1-20170916.214502-895
 konanVersion=0.3.3
 org.gradle.jvmargs='-Dfile.encoding=UTF-8'
 
 ##
 # required for performance mesuarement tasks
-kotlinStdLibJdk8Version=1.1-20170911.000327-766
-kotlinGradlePluginVersion=1.1-20170911.001619-835
+kotlinStdLibJdk8Version=1.1-20170916.214349-804
+kotlinGradlePluginVersion=1.1-20170916.215405-873