From 8d02d00f22734010cd9ff15758c035b372ba4484 Mon Sep 17 00:00:00 2001
From: Igor Chevdar <igor.chevdar@jetbrains.com>
Date: Wed, 18 Dec 2019 12:32:35 +0300
Subject: [PATCH] [IR Serialization] Removed native-specific hack in mangler

---
 .../kotlin/backend/common/serialization/KotlinMangler.kt        | 1 -
 .../src/org/jetbrains/kotlin/library/KotlinAbiVersion.kt        | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinMangler.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinMangler.kt
index 08cc2877d84..69c42911b78 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinMangler.kt
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinMangler.kt
@@ -209,7 +209,6 @@ abstract class KotlinManglerImpl : KotlinMangler {
         val signatureSuffix =
             when {
                 this.typeParameters.isNotEmpty() -> "Generic"
-                returnType.isInlined -> "ValueType"
                 !returnType.isUnitOrNullableUnit() -> typeToHashString(returnType, typeParameterNamer)
                 else -> ""
             }
diff --git a/compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinAbiVersion.kt b/compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinAbiVersion.kt
index b14412fdc86..d97b96f41ca 100644
--- a/compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinAbiVersion.kt
+++ b/compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinAbiVersion.kt
@@ -22,7 +22,7 @@ fun String.parseKonanAbiVersion(): KotlinAbiVersion {
 
 data class KotlinAbiVersion(val version: Int) {
     companion object {
-        val CURRENT = KotlinAbiVersion(22)
+        val CURRENT = KotlinAbiVersion(23)
     }
 
     override fun toString() = "$version"