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

[IR] Rename fqName to packageFqName for IrPackageFragment

Browse Source
This commit is contained in:
Ivan Kylchik
2023-05-15 18:07:50 +02:00
committed by Space Team
parent 75ab2ce4e7
commit b9856320cf
54 changed files with 81 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/linkage/partial/PartialLinkageUtils.kt
+1 -1
View File
@@ -40,7 +40,7 @@ internal object PartialLinkageUtils {
val IrDeclarationWithName.declarationId: DeclarationId?
get() {
return when (val parent = parent) {
is IrPackageFragment -> DeclarationId(parent.fqName.asString(), name.asString())
is IrPackageFragment -> DeclarationId(parent.packageFqName.asString(), name.asString())
is IrDeclarationWithName -> parent.declarationId?.createNested(name.asString())
else -> null
}
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt
+2 -2
View File
@@ -1418,7 +1418,7 @@ open class IrFileSerializer(
val proto = ProtoFile.newBuilder()
.setFileEntry(serializeFileEntry(file.fileEntry))
.addAllFqName(serializeFqName(file.fqName.asString()))
.addAllFqName(serializeFqName(file.packageFqName.asString()))
.addAllAnnotation(serializeAnnotations(file.annotations))
file.declarations.forEach {
@@ -1455,7 +1455,7 @@ open class IrFileSerializer(
return SerializedIrFile(
proto.build().toByteArray(),
file.fqName.asString(),
file.packageFqName.asString(),
file.path,
IrMemoryArrayWriter(protoTypeArray.map { it.toByteArray() }).writeIntoMemory(),
IrMemoryArrayWriter(protoIdSignatureArray.map { it.toByteArray() }).writeIntoMemory(),
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/ir/IrMangleComputer.kt
+1 -1
View File
@@ -153,7 +153,7 @@ open class IrMangleComputer(
}
override fun visitPackageFragment(declaration: IrPackageFragment) {
declaration.fqName.let { if (!it.isRoot) builder.appendName(it.asString()) }
declaration.packageFqName.let { if (!it.isRoot) builder.appendName(it.asString()) }
}
override fun visitProperty(declaration: IrProperty) {
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/signature/IdSignatureSerializer.kt
+2 -2
View File
@@ -99,7 +99,7 @@ class PublicIdSignatureComputer(val mangler: KotlinMangler.IrMangler) : IdSignat
}
override fun visitPackageFragment(declaration: IrPackageFragment) {
packageFqn = declaration.fqName
packageFqn = declaration.packageFqName
}
private val IrDeclarationWithVisibility.isTopLevelPrivate: Boolean
@@ -231,7 +231,7 @@ class IdSignatureSerializer(
private fun composeContainerIdSignature(container: IrDeclarationParent, compatibleMode: Boolean): IdSignature =
when (container) {
is IrPackageFragment -> IdSignature.CommonSignature(container.fqName.asString(), "", null, 0)
is IrPackageFragment -> IdSignature.CommonSignature(container.packageFqName.asString(), "", null, 0)
is IrDeclaration -> table.signatureByDeclaration(container, compatibleMode)
else -> error("Unexpected container ${container.render()}")
}