From bd6aff7f6a5d40243c964b821b7add3fa62676ac Mon Sep 17 00:00:00 2001
From: Mikhael Bogdanov <mikhael.bogdanov@jetbrains.com>
Date: Mon, 29 Aug 2022 08:31:04 +0200
Subject: [PATCH] Xjdk-release: avoid folder duplication

---
 .../kotlin/cli/jvm/modules/CtSymDirectoryContainer.kt     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/CtSymDirectoryContainer.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/CtSymDirectoryContainer.kt
index 5e752a11391..537f3ec5971 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/CtSymDirectoryContainer.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/CtSymDirectoryContainer.kt
@@ -33,6 +33,7 @@ class CtSymDirectoryContainer(
             when {
                 child.isDirectory -> {
                     val childPackage = if (currentPackage.isEmpty()) child.name else currentPackage + "." + child.name
+                    var addingEntry: CtSymDirectoryContainer? = null
                     if (skipPackageCheck || packages.contains(childPackage)) {
                         containers.getOrPut(childPackage) {
                             val list = mutableListOf<VirtualFile>()
@@ -43,9 +44,10 @@ class CtSymDirectoryContainer(
                                 childPackage,
                                 moduleRoot,
                                 skipPackageCheck
-                            ) to list
-                        }.also { it.second.add(child) }.first
-                    } else null
+                            ).also { addingEntry = it } to list
+                        }.also { it.second.add(child) }
+                    }
+                    addingEntry
                 }
                 isExported -> CtSymClassVirtualFile(this, child)
                 else -> null