From cbce4cf994089af4fd19fabd8a1aca09d758d855 Mon Sep 17 00:00:00 2001
From: Alexander Gorshenev <alexander.gorshenev@jetbrains.com>
Date: Thu, 27 Apr 2017 17:32:17 +0300
Subject: [PATCH] Properly process the absence of protobuf field.

---
 .../konan/serialization/LocalDeclarationDeserializer.kt  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/LocalDeclarationDeserializer.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/LocalDeclarationDeserializer.kt
index d576881ef60..2910a1a6bff 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/LocalDeclarationDeserializer.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/LocalDeclarationDeserializer.kt
@@ -98,11 +98,12 @@ class LocalDeclarationDeserializer(val rootDescriptor: DeserializedCallableMembe
     }
 
     private fun memberDeserializer(irProto: KonanIr.KotlinDescriptor): MemberDeserializer {
-        val containingFqName = irProto.classOrPackage
-        return if (containingFqName != null) {
-            memberDeserializerByParentFqNameIndex(containingFqName)
+        return if (irProto.hasClassOrPackage()) {
+            memberDeserializerByParentFqNameIndex(irProto.classOrPackage)
+        } else {
             // TODO: learn to take the containing IR declaration
-        } else this.memberDeserializer
+            this.memberDeserializer
+        }
     }
 
     fun deserializeFunction(irProto: KonanIr.KotlinDescriptor): FunctionDescriptor =