From 5d19ac16d5c67102e398e409db40b8d569647330 Mon Sep 17 00:00:00 2001
From: Dmitriy Dolovov <Dmitriy.Dolovov@jetbrains.com>
Date: Fri, 5 Feb 2021 23:07:42 +0300
Subject: [PATCH] [Commonizer] Drop useless CirPackageNode.moduleName property

---
 .../kotlin/descriptors/commonizer/mergedtree/CirNode.kt   | 1 -
 .../descriptors/commonizer/mergedtree/CirPackageNode.kt   | 3 +--
 .../descriptors/commonizer/mergedtree/CirTreeMerger.kt    | 7 +++----
 .../descriptors/commonizer/mergedtree/nodeBuilders.kt     | 8 +++-----
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirNode.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirNode.kt
index da6e5f63e72..f2121be0f80 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirNode.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirNode.kt
@@ -5,7 +5,6 @@
 
 package org.jetbrains.kotlin.descriptors.commonizer.mergedtree
 
-import gnu.trove.THashMap
 import org.jetbrains.kotlin.descriptors.commonizer.cir.CirClassifier
 import org.jetbrains.kotlin.descriptors.commonizer.cir.CirDeclaration
 import org.jetbrains.kotlin.descriptors.commonizer.cir.CirLiftedUpDeclaration
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirPackageNode.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirPackageNode.kt
index c52eb4e5849..2f47cadbe31 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirPackageNode.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirPackageNode.kt
@@ -15,8 +15,7 @@ import org.jetbrains.kotlin.storage.NullableLazyValue
 class CirPackageNode(
     override val targetDeclarations: CommonizedGroup<CirPackage>,
     override val commonDeclaration: NullableLazyValue<CirPackage>,
-    override val fqName: FqName,
-    val moduleName: Name
+    override val fqName: FqName
 ) : CirNodeWithFqName<CirPackage, CirPackage>, CirNodeWithMembers<CirPackage, CirPackage> {
 
     override val properties: MutableMap<PropertyApproximationKey, CirPropertyNode> = THashMap()
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirTreeMerger.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirTreeMerger.kt
index 6b3a2c75ded..e81bc140879 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirTreeMerger.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirTreeMerger.kt
@@ -130,7 +130,7 @@ class CirTreeMerger(
         moduleNode.targetDeclarations[targetIndex] = CirModuleFactory.create(moduleDescriptor)
 
         moduleDescriptor.collectNonEmptyPackageMemberScopes { packageFqName, packageMemberScope ->
-            processPackage(moduleNode, targetIndex, packageFqName.intern(), packageMemberScope, moduleName)
+            processPackage(moduleNode, targetIndex, packageFqName.intern(), packageMemberScope)
         }
     }
 
@@ -138,11 +138,10 @@ class CirTreeMerger(
         moduleNode: CirModuleNode,
         targetIndex: Int,
         packageFqName: FqName,
-        packageMemberScope: MemberScope,
-        moduleName: Name
+        packageMemberScope: MemberScope
     ) {
         val packageNode: CirPackageNode = moduleNode.packages.getOrPut(packageFqName) {
-            buildPackageNode(storageManager, size, packageFqName, moduleName)
+            buildPackageNode(storageManager, size, packageFqName)
         }
         packageNode.targetDeclarations[targetIndex] = CirPackageFactory.create(packageFqName)
 
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/nodeBuilders.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/nodeBuilders.kt
index 4407ff92f0b..7661246fd9d 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/nodeBuilders.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/nodeBuilders.kt
@@ -5,14 +5,13 @@
 
 package org.jetbrains.kotlin.descriptors.commonizer.mergedtree
 
-import org.jetbrains.kotlin.descriptors.commonizer.cir.*
+import org.jetbrains.kotlin.descriptors.commonizer.cir.CirDeclaration
 import org.jetbrains.kotlin.descriptors.commonizer.cir.impl.CirClassRecursionMarker
 import org.jetbrains.kotlin.descriptors.commonizer.cir.impl.CirClassifierRecursionMarker
 import org.jetbrains.kotlin.descriptors.commonizer.core.*
 import org.jetbrains.kotlin.descriptors.commonizer.utils.CommonizedGroup
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.storage.NullableLazyValue
 import org.jetbrains.kotlin.storage.StorageManager
 
@@ -39,14 +38,13 @@ internal fun buildModuleNode(
 internal fun buildPackageNode(
     storageManager: StorageManager,
     size: Int,
-    fqName: FqName,
-    moduleName: Name
+    fqName: FqName
 ): CirPackageNode = buildNode(
     storageManager = storageManager,
     size = size,
     commonizerProducer = ::PackageCommonizer,
     nodeProducer = { targetDeclarations, commonDeclaration ->
-        CirPackageNode(targetDeclarations, commonDeclaration, fqName, moduleName)
+        CirPackageNode(targetDeclarations, commonDeclaration, fqName)
     }
 )