From a4bf7c977266707e5a4369a178e1f23e7d6b34c1 Mon Sep 17 00:00:00 2001
From: "Aleksei.Cherepanov" <aleksei.cherepanov@jetbrains.com>
Date: Fri, 22 Oct 2021 16:30:30 +0300
Subject: [PATCH] [CHERRY PICKED FROM IJ] Fix JPS compilation

GitOrigin-RevId: a799879de2add4ca719307ddf9a143605468e731
Original commit: https://github.com/JetBrains/intellij-community/commit/9746206871853f44205b31dd8757ed2a4ad586ca
---
 .../kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt
index 374124eff41..a2ba1a6a5ce 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt
@@ -367,7 +367,7 @@ class KotlinJvmModuleBuildTarget(kotlinContext: KotlinCompileContext, jpsModuleB
 
                 // process inlineConstTracker
                 for (sourceFile: File in sourceFiles) {
-                    val cRefs = inlineConstTracker.inlineConstMap[sourceFile.path]?.map { cRef: ConstantRef ->
+                    val cRefs = inlineConstTracker.inlineConstMap[sourceFile.path]?.mapNotNull { cRef: ConstantRef ->
                         val descriptor = when (cRef.constType) {
                             "Byte" -> "B"
                             "Short" -> "S"
@@ -378,8 +378,8 @@ class KotlinJvmModuleBuildTarget(kotlinContext: KotlinCompileContext, jpsModuleB
                             "Boolean" -> "Z"
                             "Char" -> "C"
                             "String" -> "Ljava/lang/String;"
-                            else -> ""
-                        }
+                            else -> null
+                        } ?: return@mapNotNull null
                         Callbacks.createConstantReference(cRef.owner, cRef.name, descriptor)
                     } ?: continue