From e2cbe5377613af663b7b50441c575ac3885e001b Mon Sep 17 00:00:00 2001
From: Igor Chevdar <igor.chevdar@jetbrains.com>
Date: Tue, 1 Dec 2020 18:14:32 +0500
Subject: [PATCH] [IR] Supported value classes

---
 .../kotlin/backend/konan/InlineClasses.kt     |  5 +++--
 .../konan/lower/BuiltinOperatorLowering.kt    |  2 +-
 .../backend.native/tests/build.gradle         |  4 ++++
 .../tests/codegen/inlineClass/valueClass0.kt  | 20 +++++++++++++++++++
 4 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 kotlin-native/backend.native/tests/codegen/inlineClass/valueClass0.kt

diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/InlineClasses.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/InlineClasses.kt
index af230bc662e..d7d3e3ca1f5 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/InlineClasses.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/InlineClasses.kt
@@ -29,6 +29,7 @@ import org.jetbrains.kotlin.name.FqNameUnsafe
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameUnsafe
 import org.jetbrains.kotlin.resolve.descriptorUtil.getAllSuperClassifiers
+import org.jetbrains.kotlin.resolve.isInlineClass
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.isNullable
 import org.jetbrains.kotlin.types.typeUtil.makeNullable
@@ -254,7 +255,7 @@ internal object KotlinTypeInlineClassesSupport : InlineClassesSupport<ClassDescr
         else type.constructor.supertypes.asSequence().flatMap { computeFullErasure(it) }
     }
 
-    override fun hasInlineModifier(clazz: ClassDescriptor): Boolean = clazz.isInline
+    override fun hasInlineModifier(clazz: ClassDescriptor): Boolean = clazz.isInlineClass()
 
     override fun getNativePointedSuperclass(clazz: ClassDescriptor): ClassDescriptor? = clazz.getAllSuperClassifiers()
             .firstOrNull { it.fqNameUnsafe == InteropFqNames.nativePointed } as ClassDescriptor?
@@ -295,7 +296,7 @@ private object IrTypeInlineClassesSupport : InlineClassesSupport<IrClass, IrType
         }
     }
 
-    override fun hasInlineModifier(clazz: IrClass): Boolean = clazz.descriptor.isInline
+    override fun hasInlineModifier(clazz: IrClass): Boolean = clazz.isInline
 
     override fun getNativePointedSuperclass(clazz: IrClass): IrClass? {
         var superClass: IrClass? = clazz
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/BuiltinOperatorLowering.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/BuiltinOperatorLowering.kt
index 082f34c8240..67e979b9125 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/BuiltinOperatorLowering.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/BuiltinOperatorLowering.kt
@@ -129,7 +129,7 @@ internal class BuiltinOperatorLowering(val context: Context) : FileLoweringPass,
     }
 
     private fun inlinedClassHasDefaultEquals(irClass: IrClass): Boolean {
-        if (!irClass.descriptor.isInline) {
+        if (!irClass.isInline) {
             // Implicitly-inlined class, e.g. primitive one.
             return true
         }
diff --git a/kotlin-native/backend.native/tests/build.gradle b/kotlin-native/backend.native/tests/build.gradle
index b06f18abc11..98d48b094bd 100644
--- a/kotlin-native/backend.native/tests/build.gradle
+++ b/kotlin-native/backend.native/tests/build.gradle
@@ -3275,6 +3275,10 @@ task inlineClass_secondaryConstructorWithGenerics(type: KonanLocalTest) {
     source = "codegen/inlineClass/secondaryConstructorWithGenerics.kt"
 }
 
+task valueClass0(type: KonanLocalTest) {
+    source = "codegen/inlineClass/valueClass0.kt"
+}
+
 task deserialized_inline0(type: KonanLocalTest) {
     source = "serialization/deserialized_inline0.kt"
 }
diff --git a/kotlin-native/backend.native/tests/codegen/inlineClass/valueClass0.kt b/kotlin-native/backend.native/tests/codegen/inlineClass/valueClass0.kt
new file mode 100644
index 00000000000..0c3e6580096
--- /dev/null
+++ b/kotlin-native/backend.native/tests/codegen/inlineClass/valueClass0.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the LICENSE file.
+ */
+
+package codegen.inlineClass.valueClass0
+
+import kotlin.test.*
+
+// Based on KT-27225.
+
+value class First(val value: Int)
+
+value class Second(val value: First) {
+    constructor(c: Int) : this(First(c))
+}
+
+@Test fun runTest() {
+    assertEquals(Second(42).value.value, 42)
+}