From 3a96c6b9797113358bd50142488389a747cf12a3 Mon Sep 17 00:00:00 2001
From: Vasily Levchenko <vasily.v.levchenko@gmail.com>
Date: Mon, 28 Jan 2019 10:50:17 +0300
Subject: [PATCH] [kotlin compiler][update] 1.3.30-dev-1157

---
 .../serialization/IrModuleDeserializer.kt     | 31 ++++++++++---------
 .../KonanIrModuleDeserializer.kt              |  7 +++--
 gradle.properties                             |  6 ++--
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/IrModuleDeserializer.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/IrModuleDeserializer.kt
index 189f56b1325..62a679a7528 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/IrModuleDeserializer.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/IrModuleDeserializer.kt
@@ -761,22 +761,23 @@ abstract class IrModuleDeserializer(
 
         val symbol = deserializeIrSymbol(proto.symbol) as IrClassSymbol
 
+        val modality = deserializeModality(proto.modality)
         val clazz = symbolTable.declareClass(UNDEFINED_OFFSET, UNDEFINED_OFFSET, irrelevantOrigin,
-            symbol.descriptor, { symbol ->
-                IrClassImpl(
-                    start, end, origin,
-                    symbol,
-                    Name.identifier(proto.name),
-                    deserializeClassKind(proto.kind),
-                    deserializeVisibility(proto.visibility),
-                    deserializeModality(proto.modality),
-                    proto.isCompanion,
-                    proto.isInner,
-                    proto.isData,
-                    proto.isExternal,
-                    proto.isInline
-                )
-            })
+            symbol.descriptor, modality) { symbol ->
+            IrClassImpl(
+                        start, end, origin,
+                        symbol,
+                        Name.identifier(proto.name),
+                        deserializeClassKind(proto.kind),
+                        deserializeVisibility(proto.visibility),
+                        modality,
+                        proto.isCompanion,
+                        proto.isInner,
+                        proto.isData,
+                        proto.isExternal,
+                        proto.isInline
+            )
+        }
 
         proto.declarationContainer.declarationList.forEach {
             val member = deserializeDeclaration(it, clazz)
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrModuleDeserializer.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrModuleDeserializer.kt
index 04910db556c..5974fb8184e 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrModuleDeserializer.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrModuleDeserializer.kt
@@ -279,10 +279,11 @@ class KonanIrModuleDeserializer(
                 .filter { it.descriptor.findPackage() == packageFragment }
             val declarations = symbols.map {
 
+                val classDescriptor = it.descriptor as ClassDescriptor
                 val declaration = symbolTable.declareClass(UNDEFINED_OFFSET, UNDEFINED_OFFSET, irrelevantOrigin,
-                    it.descriptor as ClassDescriptor,
-                    { symbol: IrClassSymbol -> IrClassImpl(UNDEFINED_OFFSET, UNDEFINED_OFFSET, irrelevantOrigin, symbol) }
-                )
+                        classDescriptor,
+                        classDescriptor.modality
+                ) { symbol: IrClassSymbol -> IrClassImpl(UNDEFINED_OFFSET, UNDEFINED_OFFSET, irrelevantOrigin, symbol) }
                 declaration
 
             }
diff --git a/gradle.properties b/gradle.properties
index 36c38283031..750e84c68d1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,9 +18,9 @@
 buildKotlinVersion=1.3.0-rc-116
 buildKotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_130_CompilerAllPlugins),number:1.3.0-rc-116,tag:kotlin-native,pinned:true/artifacts/content/maven
 remoteRoot=konan_tests
-kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_CompilerAllPlugins),number:1.3.30-dev-964,pinned:true/artifacts/content/maven
-kotlinVersion=1.3.30-dev-964
-testKotlinVersion=1.3.30-dev-964
+kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_CompilerAllPlugins),number:1.3.30-dev-1157,pinned:true/artifacts/content/maven
+kotlinVersion=1.3.30-dev-1157
+testKotlinVersion=1.3.30-dev-1157
 konanVersion=1.2.0
 org.gradle.jvmargs='-Dfile.encoding=UTF-8'
 org.gradle.workers.max=4