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

IR: rename {name,fqName}Safe -> {name,fqName}ForIrSerialization

Browse Source 
These properties have a very specific detail in their behavior, in that
the constructor's name is set to be "<init>". While this is OK for the
IR serialization, this may not always be expected in other cases, and
their rather common names (`name`, `fqNameSafe`) suggested that these
properties could be used in generic contexts.

Change all usages outside IR serialization to use
`IrDeclarationWithName.name` and nullable
`IrDeclarationWithName.fqNameWhenAvailable` instead
This commit is contained in:
Alexander Udalov
2019-05-21 18:50:04 +02:00
parent 4e1effd065
commit 8dc34ae7b9
7 changed files with 64 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinMangler.kt
+7 -7
View File
@@ -110,7 +110,7 @@ abstract class KotlinManglerImpl: KotlinMangler {
return "#GENERIC${if (type.isMarkedNullable()) "?" else ""}$upperBounds"
}
var hashString = type.getClass()?.run { fqNameSafe.asString() } ?: "<dynamic>"
var hashString = type.getClass()?.run { fqNameForIrSerialization.asString() } ?: "<dynamic>"
when (type) {
is IrSimpleType -> {
@@ -185,7 +185,7 @@ abstract class KotlinManglerImpl: KotlinMangler {
val IrField.symbolName: String
get() {
val containingDeclarationPart = parent.fqNameSafe.let {
val containingDeclarationPart = parent.fqNameForIrSerialization.let {
if (it.isRoot) "" else "$it."
}
return "kfield:$containingDeclarationPart$name"
@@ -195,12 +195,12 @@ abstract class KotlinManglerImpl: KotlinMangler {
val IrClass.typeInfoSymbolName: String
get() {
assert(this.isExported())
return "ktype:" + this.fqNameSafe.toString()
return "ktype:" + this.fqNameForIrSerialization.toString()
}
val IrTypeParameter.symbolName: String
get() {
val containingDeclarationPart = parent.fqNameSafe
val containingDeclarationPart = parent.fqNameForIrSerialization
return "ktypeparam:$containingDeclarationPart$name"
}
@@ -233,14 +233,14 @@ abstract class KotlinManglerImpl: KotlinMangler {
private val IrDeclaration.uniqName: Name
get() = when (this) {
is IrSimpleFunction -> Name.special("<${this.uniqFunctionName}>")
else -> this.name
else -> this.nameForIrSerialization
}
private val IrProperty.symbolName: String
get() {
val extensionReceiver: String = getter!!.extensionReceiverParameter?.extensionReceiverNamePart ?: ""
val containingDeclarationPart = parent.fqNameSafe.let {
val containingDeclarationPart = parent.fqNameForIrSerialization.let {
if (it.isRoot) "" else "$it."
}
return "kprop:$containingDeclarationPart$extensionReceiver$name"
@@ -248,7 +248,7 @@ abstract class KotlinManglerImpl: KotlinMangler {
private val IrEnumEntry.symbolName: String
get() {
val containingDeclarationPart = parent.fqNameSafe.let {
val containingDeclarationPart = parent.fqNameForIrSerialization.let {
if (it.isRoot) "" else "$it."
}
return "kenumentry:$containingDeclarationPart$name"