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

[IR SERIALIZATION] Cleanup mangler interface

Browse Source
This commit is contained in:
Roman Artemev
2019-09-02 15:28:50 +03:00
committed by romanart
parent 2e0ab8ba3f
commit 31f3e668d2
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/DeclarationTable.kt
+4 -2
View File
@@ -45,11 +45,13 @@ abstract class GlobalDeclarationTable(private val mangler: KotlinMangler, privat
open fun computeUniqIdByDeclaration(declaration: IrDeclaration): UniqId { open fun computeUniqIdByDeclaration(declaration: IrDeclaration): UniqId {
return table.getOrPut(declaration) { return table.getOrPut(declaration) {
UniqId(mangler.hashedMangleImpl(declaration), false).also { clashTracker.commit(declaration, it) } with(mangler) {
UniqId(declaration.hashedMangle, false).also { clashTracker.commit(declaration, it) }
}
} }
} }
fun isExportedDeclaration(declaration: IrDeclaration): Boolean = mangler.isExportedImpl(declaration) fun isExportedDeclaration(declaration: IrDeclaration): Boolean = with(mangler) { declaration.isExported() }
} }
class DeclarationTable( class DeclarationTable(
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinMangler.kt
+2 -4
View File
@@ -16,9 +16,7 @@ import org.jetbrains.kotlin.name.Name
interface KotlinMangler { interface KotlinMangler {
val String.hashMangle: Long val String.hashMangle: Long
val IrDeclaration.hashedMangle: Long val IrDeclaration.hashedMangle: Long
fun hashedMangleImpl(declaration: IrDeclaration): Long
fun IrDeclaration.isExported(): Boolean fun IrDeclaration.isExported(): Boolean
fun isExportedImpl(declaration: IrDeclaration): Boolean
val IrFunction.functionName: String val IrFunction.functionName: String
val IrType.isInlined: Boolean val IrType.isInlined: Boolean
val Long.isSpecial: Boolean val Long.isSpecial: Boolean
@@ -33,7 +31,7 @@ interface KotlinMangler {
abstract class KotlinManglerImpl : KotlinMangler { abstract class KotlinManglerImpl : KotlinMangler {
override val String.hashMangle get() = this.cityHash64() override val String.hashMangle get() = this.cityHash64()
override fun hashedMangleImpl(declaration: IrDeclaration): Long { private fun hashedMangleImpl(declaration: IrDeclaration): Long {
return declaration.uniqSymbolName().hashMangle return declaration.uniqSymbolName().hashMangle
} }
@@ -54,7 +52,7 @@ abstract class KotlinManglerImpl : KotlinMangler {
* that doesn't depend on any internal transformations (e.g. IR lowering), * that doesn't depend on any internal transformations (e.g. IR lowering),
* and so should be computable from the descriptor itself without checking a backend state. * and so should be computable from the descriptor itself without checking a backend state.
*/ */
tailrec override fun isExportedImpl(declaration: IrDeclaration): Boolean { private tailrec fun isExportedImpl(declaration: IrDeclaration): Boolean {
// TODO: revise // TODO: revise
val descriptorAnnotations = declaration.descriptor.annotations val descriptorAnnotations = declaration.descriptor.annotations