[Commonizer] Drop useless CirPackageNode.moduleName property
This commit is contained in:
-1
@@ -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
|
||||
|
||||
+1
-2
@@ -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()
|
||||
|
||||
+3
-4
@@ -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)
|
||||
|
||||
|
||||
+3
-5
@@ -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)
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user