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

[Commonizer] Rename: CirTreeMergerV2 -> CirTreeMerger

Browse Source
This commit is contained in:
Dmitriy Dolovov
2021-03-04 02:30:58 +03:00
parent 126b634529
commit a0baecc6e4
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/facade.kt
+2 -2
View File
@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.descriptors.commonizer.ResultsConsumer.Status
import org.jetbrains.kotlin.descriptors.commonizer.core.CommonizationVisitor import org.jetbrains.kotlin.descriptors.commonizer.core.CommonizationVisitor
import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.* import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.*
import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.CirNode.Companion.dimension import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.CirNode.Companion.dimension
import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.CirTreeMergerV2.CirTreeMergeResult import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.CirTreeMerger.CirTreeMergeResult
import org.jetbrains.kotlin.descriptors.commonizer.metadata.MetadataBuilder import org.jetbrains.kotlin.descriptors.commonizer.metadata.MetadataBuilder
import org.jetbrains.kotlin.library.SerializedMetadata import org.jetbrains.kotlin.library.SerializedMetadata
import org.jetbrains.kotlin.storage.LockBasedStorageManager import org.jetbrains.kotlin.storage.LockBasedStorageManager
@@ -46,7 +46,7 @@ private fun mergeAndCommonize(storageManager: StorageManager, parameters: Common
CirProvidedClassifiers.by(parameters.dependencyModulesProvider) CirProvidedClassifiers.by(parameters.dependencyModulesProvider)
) )
) )
val mergeResult = CirTreeMergerV2(storageManager, classifiers, parameters).build() val mergeResult = CirTreeMerger(storageManager, classifiers, parameters).build()
// commonize: // commonize:
val mergedTree = mergeResult.root val mergedTree = mergeResult.root
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirTreeMergerV2.kt → native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirTreeMerger.kt
+1 -1
View File
@@ -49,7 +49,7 @@ import org.jetbrains.kotlin.storage.StorageManager
* targets (which is not supported yet), or a Native library where one fragment is produced via C-interop tool and the other one * targets (which is not supported yet), or a Native library where one fragment is produced via C-interop tool and the other one
* is compiled from Kotlin/Native source code (not sure this should be supported at all). * is compiled from Kotlin/Native source code (not sure this should be supported at all).
*/ */
class CirTreeMergerV2( class CirTreeMerger(
private val storageManager: StorageManager, private val storageManager: StorageManager,
private val classifiers: CirKnownClassifiers, private val classifiers: CirKnownClassifiers,
private val parameters: CommonizerParameters private val parameters: CommonizerParameters