From 146eac0010d360269a61f6284bf167b9f1828402 Mon Sep 17 00:00:00 2001
From: Dmitriy Dolovov <Dmitriy.Dolovov@jetbrains.com>
Date: Wed, 15 Aug 2018 10:54:42 +0300
Subject: [PATCH] fix merge conflicts (Move KonanBuildIns to a separate module)

---
 .../src/org/jetbrains/kotlin/backend/konan/InlineClasses.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/InlineClasses.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/InlineClasses.kt
index 1a0e6060ac7..fc12f8785cb 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/InlineClasses.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/InlineClasses.kt
@@ -293,7 +293,7 @@ private object IrTypeInlineClassesSupport : InlineClassesSupport<IrClass, IrType
     override fun hasInlineModifier(clazz: IrClass): Boolean = clazz.descriptor.isInline
 
     override fun getNativePointedSuperclass(clazz: IrClass): IrClass? = clazz.getAllSuperClassifiers()
-            .firstOrNull { it.fqNameSafe.toUnsafe() == InteropFqNames.nativePointed }
+            .firstOrNull { it.descriptor.fqNameUnsafe == InteropFqNames.nativePointed }
 
     override fun getInlinedClassUnderlyingType(clazz: IrClass): IrType =
             clazz.constructors.first { it.isPrimary }.valueParameters.single().type