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

IR: make isExternal immutable

Browse Source
This commit is contained in:
Anton Bannykh
2021-02-26 13:31:59 +03:00
committed by TeamCityServer
parent b0e0e62c0b
commit 87f3ca3f36
32 changed files with 45 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.tree.persistent/generator/src/org/jetbrains/kotlin/ir/persistentIrGenerator/Class.kt
-3
View File
@@ -13,7 +13,6 @@ internal fun PersistentIrGenerator.generateClass() {
val metadataField = Field("metadata", irDeclaration("MetadataSource") + "?")
val modalityField = Field("modality", descriptorType("Modality"))
val attributeOwnerIdField = Field("attributeOwnerId", IrAttributeContainer)
val isExternalField = Field("isExternal", +"Boolean", notEq = "!=")
writeFile("PersistentIrClass.kt", renderFile("org.jetbrains.kotlin.ir.declarations.persistent") {
lines(
@@ -69,7 +68,6 @@ internal fun PersistentIrGenerator.generateClass() {
superTypesField.toPersistentField(+"emptyList()"),
metadataField.toPersistentField(+"null"),
modalityField.toPersistentField(+"modality"),
isExternalField.toPersistentField(+"isExternal"),
attributeOwnerIdField.toPersistentField(+"this"),
),
id,
@@ -86,7 +84,6 @@ internal fun PersistentIrGenerator.generateClass() {
attributeOwnerIdField,
typeParametersField,
superTypesField,
isExternalField,
)()
})
}
compiler/ir/ir.tree.persistent/generator/src/org/jetbrains/kotlin/ir/persistentIrGenerator/Constructor.kt
-3
View File
@@ -14,7 +14,6 @@ internal fun PersistentIrGenerator.generateConstructor() {
val bodyField = Field("body", IrBody + "?")
val metadataField = Field("metadata", MetadataSource + "?")
val visibilityField = Field("visibility", DescriptorVisibility)
val isExternalField = Field("isExternal", +"Boolean", notEq = "!=")
writeFile("PersistentIrConstructor.kt", renderFile("org.jetbrains.kotlin.ir.declarations.persistent") {
lines(
@@ -57,7 +56,6 @@ internal fun PersistentIrGenerator.generateConstructor() {
bodyField.toBody(),
metadataField.toPersistentField(+"null"),
visibilityField.toPersistentField(+"visibility"),
isExternalField.toPersistentField(+"isExternal"),
descriptor(ClassConstructorDescriptor)
),
id,
@@ -75,7 +73,6 @@ internal fun PersistentIrGenerator.generateConstructor() {
visibilityField,
typeParametersField,
valueParametersField,
isExternalField,
)()
})
}
compiler/ir/ir.tree.persistent/generator/src/org/jetbrains/kotlin/ir/persistentIrGenerator/Field.kt
-3
View File
@@ -10,7 +10,6 @@ internal fun PersistentIrGenerator.generateField() {
val correspondingPropertySymbolField = Field("correspondingPropertySymbol", IrPropertySymbol + "?")
val metadataField = Field("metadata", MetadataSource + "?")
val typeField = Field("type", IrType)
val isExternalField = Field("isExternal", +"Boolean", notEq = "!=")
writeFile("PersistentIrField.kt", renderFile("org.jetbrains.kotlin.ir.declarations.persistent") {
lines(
@@ -37,7 +36,6 @@ internal fun PersistentIrGenerator.generateField() {
correspondingPropertySymbolField.toPersistentField(+"null"),
metadataField.toPersistentField(+"null"),
typeField.toPersistentField(+"type"),
isExternalField.toPersistentField(+"isExternal"),
),
id,
)()
@@ -50,7 +48,6 @@ internal fun PersistentIrGenerator.generateField() {
initializerField,
correspondingPropertySymbolField,
metadataField,
isExternalField,
)()
})
}
compiler/ir/ir.tree.persistent/generator/src/org/jetbrains/kotlin/ir/persistentIrGenerator/Function.kt
-3
View File
@@ -18,7 +18,6 @@ internal fun PersistentIrGenerator.generateFunction() {
val overriddenSymbolsField = Field("overriddenSymbols", +"List<" + irSymbol("IrSimpleFunctionSymbol") + ">")
val attributeOwnerIdField = Field("attributeOwnerId", IrAttributeContainer)
val correspondingPropertySymbolField = Field("correspondingPropertySymbol", IrPropertySymbol + "?")
val isExternalField = Field("isExternal", +"Boolean", notEq = "!=")
writeFile("PersistentIrFunctionCommon.kt", renderFile("org.jetbrains.kotlin.ir.declarations.persistent") {
lines(
@@ -74,7 +73,6 @@ internal fun PersistentIrGenerator.generateFunction() {
attributeOwnerIdField.toPersistentField(+"this"),
),
correspondingPropertySymbolField.toPersistentField(+"null"),
isExternalField.toPersistentField(+"isExternal")
),
id,
)()
@@ -94,7 +92,6 @@ internal fun PersistentIrGenerator.generateFunction() {
correspondingPropertySymbolField,
overriddenSymbolsField,
attributeOwnerIdField,
isExternalField,
)()
})
}
compiler/ir/ir.tree.persistent/generator/src/org/jetbrains/kotlin/ir/persistentIrGenerator/PersistentIrGenerator.kt
+1 -1
View File
@@ -70,7 +70,7 @@ internal object PersistentIrGenerator {
val isCompanion = +"override val isCompanion: Boolean = false"
val isInner = +"override val isInner: Boolean = false"
val isData = +"override val isData: Boolean = false"
val isExternal = +"isExternal: Boolean"
val isExternal = +"override val isExternal: Boolean"
val isFinal = +"override val isFinal: Boolean"
val isInline = +"override val isInline: Boolean"
val isExpect = +"override val isExpect: Boolean"
compiler/ir/ir.tree.persistent/generator/src/org/jetbrains/kotlin/ir/persistentIrGenerator/Property.kt
-3
View File
@@ -11,7 +11,6 @@ internal fun PersistentIrGenerator.generateProperty() {
val setterField = Field("setter", irDeclaration("IrSimpleFunction") + "?")
val metadataField = Field("metadata", MetadataSource + "?")
val attributeOwnerIdField = Field("attributeOwnerId", IrAttributeContainer)
val isExternalField = Field("isExternal", +"Boolean", notEq = "!=")
writeFile("PersistentIrPropertyCommon.kt", renderFile("org.jetbrains.kotlin.ir.declarations.persistent") {
lines(
@@ -42,7 +41,6 @@ internal fun PersistentIrGenerator.generateProperty() {
+"@Suppress(\"LeakingThis\")",
attributeOwnerIdField.toPersistentField(+"this"),
),
isExternalField.toPersistentField(+"isExternal"),
),
id,
)()
@@ -56,7 +54,6 @@ internal fun PersistentIrGenerator.generateProperty() {
setterField,
metadataField,
attributeOwnerIdField,
isExternalField,
)()
})
}