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

[Commonizer] Drop CirRootFactory

Browse Source
This commit is contained in:
Dmitriy Dolovov
2021-03-05 00:26:53 +03:00
parent d7ed8ff804
commit 1f17d238f8
6 changed files with 13 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirRoot.kt
+9
View File
@@ -9,4 +9,13 @@ import org.jetbrains.kotlin.descriptors.commonizer.CommonizerTarget
interface CirRoot : CirDeclaration {
val target: CommonizerTarget
companion object {
@Suppress("NOTHING_TO_INLINE")
inline fun create(target: CommonizerTarget): CirRoot = CirRootImpl(target)
}
}
data class CirRootImpl(
override val target: CommonizerTarget
) : CirRoot
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirRootFactory.kt
-14
View File
@@ -1,14 +0,0 @@
/*
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.descriptors.commonizer.cir.factory
import org.jetbrains.kotlin.descriptors.commonizer.CommonizerTarget
import org.jetbrains.kotlin.descriptors.commonizer.cir.CirRoot
import org.jetbrains.kotlin.descriptors.commonizer.cir.impl.CirRootImpl
object CirRootFactory {
fun create(target: CommonizerTarget): CirRoot = CirRootImpl(target = target)
}
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirRootImpl.kt
-13
View File
@@ -1,13 +0,0 @@
/*
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.descriptors.commonizer.cir.impl
import org.jetbrains.kotlin.descriptors.commonizer.CommonizerTarget
import org.jetbrains.kotlin.descriptors.commonizer.cir.CirRoot
data class CirRootImpl(
override val target: CommonizerTarget
) : CirRoot
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/RootCommonizer.kt
+1 -2
View File
@@ -8,12 +8,11 @@ package org.jetbrains.kotlin.descriptors.commonizer.core
import org.jetbrains.kotlin.descriptors.commonizer.LeafCommonizerTarget
import org.jetbrains.kotlin.descriptors.commonizer.SharedCommonizerTarget
import org.jetbrains.kotlin.descriptors.commonizer.cir.CirRoot
import org.jetbrains.kotlin.descriptors.commonizer.cir.factory.CirRootFactory
class RootCommonizer : AbstractStandardCommonizer<CirRoot, CirRoot>() {
private val leafTargets = mutableSetOf<LeafCommonizerTarget>()
override fun commonizationResult() = CirRootFactory.create(
override fun commonizationResult() = CirRoot.create(
target = SharedCommonizerTarget(leafTargets)
)
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirTreeMerger.kt
+2 -1
View File
@@ -17,6 +17,7 @@ import org.jetbrains.kotlin.descriptors.commonizer.TargetProvider
import org.jetbrains.kotlin.descriptors.commonizer.cir.CirEntityId
import org.jetbrains.kotlin.descriptors.commonizer.cir.CirName
import org.jetbrains.kotlin.descriptors.commonizer.cir.CirPackageName
import org.jetbrains.kotlin.descriptors.commonizer.cir.CirRoot
import org.jetbrains.kotlin.descriptors.commonizer.cir.factory.*
import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ClassesToProcess.ClassEntry
import org.jetbrains.kotlin.descriptors.commonizer.metadata.utils.SerializedMetadataLibraryProvider
@@ -115,7 +116,7 @@ class CirTreeMerger(
targetProvider: TargetProvider,
commonModuleInfos: Collection<ModuleInfo>
) {
rootNode.targetDeclarations[targetIndex] = CirRootFactory.create(targetProvider.target)
rootNode.targetDeclarations[targetIndex] = CirRoot.create(targetProvider.target)
if (commonModuleInfos.isEmpty())
return
native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/RootCommonizerTest.kt
+1 -2
View File
@@ -9,7 +9,6 @@ import org.jetbrains.kotlin.descriptors.commonizer.CommonizerTarget
import org.jetbrains.kotlin.descriptors.commonizer.LeafCommonizerTarget
import org.jetbrains.kotlin.descriptors.commonizer.SharedCommonizerTarget
import org.jetbrains.kotlin.descriptors.commonizer.cir.CirRoot
import org.jetbrains.kotlin.descriptors.commonizer.cir.factory.CirRootFactory
import org.jetbrains.kotlin.konan.target.KonanTarget
import org.junit.Test
@@ -104,6 +103,6 @@ class RootCommonizerTest : AbstractCommonizerTest<CirRoot, CirRoot>() {
override fun isEqual(a: CirRoot?, b: CirRoot?) = (a === b) || (a != null && b != null && a.target == b.target)
private companion object {
fun CommonizerTarget.toMock() = CirRootFactory.create(target = this)
fun CommonizerTarget.toMock() = CirRoot.create(target = this)
}
}