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

[Commonizer] Drop CirModuleFactory

Browse Source
This commit is contained in:
Dmitriy Dolovov
2021-03-05 00:28:31 +03:00
parent 1f17d238f8
commit bfe0623837
5 changed files with 13 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirModule.kt
+10 -1
View File
@@ -5,4 +5,13 @@
package org.jetbrains.kotlin.descriptors.commonizer.cir
interface CirModule : CirDeclaration, CirHasName
interface CirModule : CirDeclaration, CirHasName {
companion object {
@Suppress("NOTHING_TO_INLINE")
inline fun create(name: CirName): CirModule = CirModuleImpl(name)
}
}
data class CirModuleImpl(
override val name: CirName
) : CirModule
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirModuleFactory.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.factory
import org.jetbrains.kotlin.descriptors.commonizer.cir.CirName
import org.jetbrains.kotlin.descriptors.commonizer.cir.impl.CirModuleImpl
object CirModuleFactory {
fun create(name: CirName) = CirModuleImpl(name)
}
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirModuleImpl.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.cir.CirModule
import org.jetbrains.kotlin.descriptors.commonizer.cir.CirName
data class CirModuleImpl(
override val name: CirName
) : CirModule
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ModuleCommonizer.kt
+1 -2
View File
@@ -7,12 +7,11 @@ package org.jetbrains.kotlin.descriptors.commonizer.core
import org.jetbrains.kotlin.descriptors.commonizer.cir.CirModule
import org.jetbrains.kotlin.descriptors.commonizer.cir.CirName
import org.jetbrains.kotlin.descriptors.commonizer.cir.factory.CirModuleFactory
class ModuleCommonizer : AbstractStandardCommonizer<CirModule, CirModule>() {
private lateinit var name: CirName
override fun commonizationResult() = CirModuleFactory.create(name = name)
override fun commonizationResult() = CirModule.create(name = name)
override fun initialize(first: CirModule) {
name = first.name
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirTreeMerger.kt
+2 -5
View File
@@ -14,10 +14,7 @@ import org.jetbrains.kotlin.descriptors.commonizer.CommonizerParameters
import org.jetbrains.kotlin.descriptors.commonizer.LeafCommonizerTarget
import org.jetbrains.kotlin.descriptors.commonizer.ModulesProvider.ModuleInfo
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.*
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
@@ -149,7 +146,7 @@ class CirTreeMerger(
val moduleNode: CirModuleNode = rootNode.modules.getOrPut(moduleName) {
buildModuleNode(storageManager, leafTargetsSize)
}
moduleNode.targetDeclarations[context.targetIndex] = CirModuleFactory.create(moduleName)
moduleNode.targetDeclarations[context.targetIndex] = CirModule.create(moduleName)
val groupedFragments: Map<CirPackageName, Collection<KmModuleFragment>> = module.fragments.foldToMap { fragment ->
fragment.fqName?.let(CirPackageName::create) ?: error("A fragment without FQ name in module $moduleName: $fragment")