azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Commonizer] Drop useless CirPackageNode.moduleName property

Browse Source
This commit is contained in:
Dmitriy Dolovov
2021-02-05 23:07:42 +03:00
parent c6756762e5
commit 5d19ac16d5
4 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirNode.kt
-1
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.descriptors.commonizer.mergedtree 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.CirClassifier
import org.jetbrains.kotlin.descriptors.commonizer.cir.CirDeclaration import org.jetbrains.kotlin.descriptors.commonizer.cir.CirDeclaration
import org.jetbrains.kotlin.descriptors.commonizer.cir.CirLiftedUpDeclaration import org.jetbrains.kotlin.descriptors.commonizer.cir.CirLiftedUpDeclaration
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirPackageNode.kt
+1 -2
View File
@@ -15,8 +15,7 @@ import org.jetbrains.kotlin.storage.NullableLazyValue
class CirPackageNode( class CirPackageNode(
override val targetDeclarations: CommonizedGroup<CirPackage>, override val targetDeclarations: CommonizedGroup<CirPackage>,
override val commonDeclaration: NullableLazyValue<CirPackage>, override val commonDeclaration: NullableLazyValue<CirPackage>,
override val fqName: FqName, override val fqName: FqName
val moduleName: Name
) : CirNodeWithFqName<CirPackage, CirPackage>, CirNodeWithMembers<CirPackage, CirPackage> { ) : CirNodeWithFqName<CirPackage, CirPackage>, CirNodeWithMembers<CirPackage, CirPackage> {
override val properties: MutableMap<PropertyApproximationKey, CirPropertyNode> = THashMap() override val properties: MutableMap<PropertyApproximationKey, CirPropertyNode> = THashMap()
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirTreeMerger.kt
+3 -4
View File
@@ -130,7 +130,7 @@ class CirTreeMerger(
moduleNode.targetDeclarations[targetIndex] = CirModuleFactory.create(moduleDescriptor) moduleNode.targetDeclarations[targetIndex] = CirModuleFactory.create(moduleDescriptor)
moduleDescriptor.collectNonEmptyPackageMemberScopes { packageFqName, packageMemberScope -> 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, moduleNode: CirModuleNode,
targetIndex: Int, targetIndex: Int,
packageFqName: FqName, packageFqName: FqName,
packageMemberScope: MemberScope, packageMemberScope: MemberScope
moduleName: Name
) { ) {
val packageNode: CirPackageNode = moduleNode.packages.getOrPut(packageFqName) { val packageNode: CirPackageNode = moduleNode.packages.getOrPut(packageFqName) {
buildPackageNode(storageManager, size, packageFqName, moduleName) buildPackageNode(storageManager, size, packageFqName)
} }
packageNode.targetDeclarations[targetIndex] = CirPackageFactory.create(packageFqName) packageNode.targetDeclarations[targetIndex] = CirPackageFactory.create(packageFqName)
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/nodeBuilders.kt
+3 -5
View File
@@ -5,14 +5,13 @@
package org.jetbrains.kotlin.descriptors.commonizer.mergedtree 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.CirClassRecursionMarker
import org.jetbrains.kotlin.descriptors.commonizer.cir.impl.CirClassifierRecursionMarker import org.jetbrains.kotlin.descriptors.commonizer.cir.impl.CirClassifierRecursionMarker
import org.jetbrains.kotlin.descriptors.commonizer.core.* import org.jetbrains.kotlin.descriptors.commonizer.core.*
import org.jetbrains.kotlin.descriptors.commonizer.utils.CommonizedGroup import org.jetbrains.kotlin.descriptors.commonizer.utils.CommonizedGroup
import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.storage.NullableLazyValue import org.jetbrains.kotlin.storage.NullableLazyValue
import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.kotlin.storage.StorageManager
@@ -39,14 +38,13 @@ internal fun buildModuleNode(
internal fun buildPackageNode( internal fun buildPackageNode(
storageManager: StorageManager, storageManager: StorageManager,
size: Int, size: Int,
fqName: FqName, fqName: FqName
moduleName: Name
): CirPackageNode = buildNode( ): CirPackageNode = buildNode(
storageManager = storageManager, storageManager = storageManager,
size = size, size = size,
commonizerProducer = ::PackageCommonizer, commonizerProducer = ::PackageCommonizer,
nodeProducer = { targetDeclarations, commonDeclaration -> nodeProducer = { targetDeclarations, commonDeclaration ->
CirPackageNode(targetDeclarations, commonDeclaration, fqName, moduleName) CirPackageNode(targetDeclarations, commonDeclaration, fqName)
} }
) )