From 92ebb092a2a38f44cb54369dc5c477f3634f019c Mon Sep 17 00:00:00 2001
From: Georgy Bronnikov <georgy.bronnikov@jetbrains.com>
Date: Mon, 11 Nov 2019 08:08:55 +0300
Subject: [PATCH] JvmMangler

---
 .../ir/serialization.jvm/build.gradle.kts     | 20 +++++++++++++++++++
 .../backend/jvm/serialization/JvmMangler.kt   | 17 ++++++++++++++++
 settings.gradle                               |  2 ++
 3 files changed, 39 insertions(+)
 create mode 100644 compiler/ir/serialization.jvm/build.gradle.kts
 create mode 100644 compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/backend/jvm/serialization/JvmMangler.kt

diff --git a/compiler/ir/serialization.jvm/build.gradle.kts b/compiler/ir/serialization.jvm/build.gradle.kts
new file mode 100644
index 00000000000..5b248259793
--- /dev/null
+++ b/compiler/ir/serialization.jvm/build.gradle.kts
@@ -0,0 +1,20 @@
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+dependencies {
+    compile(project(":compiler:ir.tree"))
+    compile(project(":compiler:ir.serialization.common"))
+    compile(project(":compiler:ir.psi2ir"))
+    compile(project(":core:descriptors.jvm"))
+    compile(project(":core:metadata.jvm"))
+    compile(project(":compiler:frontend.java"))
+}
+
+sourceSets {
+    "main" {
+        projectDefault()
+    }
+    "test" {}
+}
\ No newline at end of file
diff --git a/compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/backend/jvm/serialization/JvmMangler.kt b/compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/backend/jvm/serialization/JvmMangler.kt
new file mode 100644
index 00000000000..8288530a99e
--- /dev/null
+++ b/compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/backend/jvm/serialization/JvmMangler.kt
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.backend.jvm.serialization
+
+import org.jetbrains.kotlin.backend.common.serialization.KotlinManglerImpl
+import org.jetbrains.kotlin.ir.types.IrType
+import org.jetbrains.kotlin.ir.util.isInlined
+
+// Copied from JsMangler for now
+object JvmMangler : KotlinManglerImpl() {
+
+    override val IrType.isInlined: Boolean
+        get() = this.isInlined()
+}
diff --git a/settings.gradle b/settings.gradle
index 1d9804ccf30..78584e2679b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -61,6 +61,7 @@ include ":kotlin-build-common",
         ":compiler:ir.ir2cfg",
         ":compiler:ir.backend.common",
         ":compiler:ir.serialization.common",
+        ":compiler:ir.serialization.jvm",
         ":compiler:ir.serialization.js",
         ":compiler:backend.js",
         ":compiler:backend.wasm",
@@ -344,6 +345,7 @@ project(':compiler:backend.js').projectDir = "$rootDir/compiler/ir/backend.js" a
 project(':compiler:backend.wasm').projectDir = "$rootDir/compiler/ir/backend.wasm" as File
 project(':compiler:backend.jvm').projectDir = "$rootDir/compiler/ir/backend.jvm" as File
 project(':compiler:ir.serialization.common').projectDir = "$rootDir/compiler/ir/serialization.common" as File
+project(':compiler:ir.serialization.jvm').projectDir = "$rootDir/compiler/ir/serialization.jvm" as File
 project(':compiler:ir.serialization.js').projectDir = "$rootDir/compiler/ir/serialization.js" as File
 project(':kotlin-util-io').projectDir = "$rootDir/compiler/util-io" as File
 project(':kotlin-util-klib').projectDir = "$rootDir/compiler/util-klib" as File