From eed9f31dacfcf0af5c32328b1760ed276e1a2a82 Mon Sep 17 00:00:00 2001
From: Pavel Punegov <pavel.punegov@jetbrains.com>
Date: Mon, 28 May 2018 20:37:36 +0300
Subject: [PATCH] Filter out expect declarations

---
 .../src/org/jetbrains/kotlin/backend/konan/ir/Ir.kt            | 3 ++-
 .../jetbrains/kotlin/backend/konan/lower/LateinitLowering.kt   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/Ir.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/Ir.kt
index 64893a7e2e2..7e088238a73 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/Ir.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/Ir.kt
@@ -38,6 +38,7 @@ import org.jetbrains.kotlin.ir.util.constructors
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedSimpleFunctionDescriptor
 import org.jetbrains.kotlin.types.KotlinType
 import kotlin.properties.Delegates
 
@@ -228,7 +229,7 @@ internal class KonanSymbols(context: Context, val symbolTable: SymbolTable): Sym
                 .singleOrNull {
                     it.valueParameters.isEmpty()
                             && (it.extensionReceiverParameter?.type?.constructor?.declarationDescriptor as? ClassDescriptor)?.defaultType == type
-                            && it.isActual
+                            && !it.isExpect
                 }
                 ?: throw Error(type.toString())
         return symbolTable.referenceSimpleFunction(descriptor)
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/LateinitLowering.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/LateinitLowering.kt
index 3bb1a066dfc..058577c1cac 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/LateinitLowering.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/LateinitLowering.kt
@@ -40,6 +40,7 @@ import org.jetbrains.kotlin.incremental.components.NoLookupLocation
 import org.jetbrains.kotlin.ir.expressions.impl.IrGetFieldImpl
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPropertyDescriptor
 import org.jetbrains.kotlin.types.TypeUtils
 
 internal class LateinitLowering(
@@ -53,7 +54,7 @@ internal class LateinitLowering(
             .getContributedVariables(Name.identifier("isInitialized"), NoLookupLocation.FROM_BACKEND).single {
                 it.extensionReceiverParameter.let {
                     it != null && TypeUtils.getClassDescriptor(it.type) == context.reflectionTypes.kProperty0
-                } && it.isActual
+                } && !it.isExpect
             }
     private val isInitializedGetterDescriptor   = isInitializedPropertyDescriptor.getter!!