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

IR: make IrValueParameter.varargElementType mutable

Browse Source
This commit is contained in:
Georgy Bronnikov
2020-09-09 21:19:55 +03:00
parent a3763e8276
commit a409976d28
4 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrValueParameterImpl.kt
+1 -1
View File
@@ -36,7 +36,7 @@ class IrValueParameterImpl(
override val name: Name, override val name: Name,
override val index: Int, override val index: Int,
override var type: IrType, override var type: IrType,
override val varargElementType: IrType?, override var varargElementType: IrType?,
override val isCrossinline: Boolean, override val isCrossinline: Boolean,
override val isNoinline: Boolean, override val isNoinline: Boolean,
override val isHidden: Boolean = false override val isHidden: Boolean = false
compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrValueParameter.kt
+10 -1
View File
@@ -38,7 +38,7 @@ internal class PersistentIrValueParameter(
override val name: Name, override val name: Name,
override val index: Int, override val index: Int,
type: IrType, type: IrType,
override val varargElementType: IrType?, varargElementType: IrType?,
override val isCrossinline: Boolean, override val isCrossinline: Boolean,
override val isNoinline: Boolean, override val isNoinline: Boolean,
override val isHidden: Boolean = false override val isHidden: Boolean = false
@@ -87,4 +87,13 @@ internal class PersistentIrValueParameter(
} }
} }
override var varargElementTypeField: IrType? = varargElementType
override var varargElementType: IrType?
get() = getCarrier().varargElementTypeField
set(v) {
if (varargElementType !== v) {
setCarrier().varargElementTypeField = v
}
}
} }
compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/ValueParameterCarrier.kt
+3 -1
View File
@@ -14,10 +14,11 @@ import org.jetbrains.kotlin.ir.types.IrType
internal interface ValueParameterCarrier : DeclarationCarrier { internal interface ValueParameterCarrier : DeclarationCarrier {
var defaultValueField: IrExpressionBody? var defaultValueField: IrExpressionBody?
var typeField: IrType var typeField: IrType
var varargElementTypeField: IrType?
override fun clone(): ValueParameterCarrier { override fun clone(): ValueParameterCarrier {
return ValueParameterCarrierImpl( return ValueParameterCarrierImpl(
lastModified, parentField, originField, annotationsField, defaultValueField, typeField lastModified, parentField, originField, annotationsField, defaultValueField, typeField, varargElementTypeField
) )
} }
} }
@@ -29,4 +30,5 @@ internal class ValueParameterCarrierImpl(
override var annotationsField: List<IrConstructorCall>, override var annotationsField: List<IrConstructorCall>,
override var defaultValueField: IrExpressionBody?, override var defaultValueField: IrExpressionBody?,
override var typeField: IrType, override var typeField: IrType,
override var varargElementTypeField: IrType?,
) : ValueParameterCarrier ) : ValueParameterCarrier
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrValueParameter.kt
+1 -1
View File
@@ -29,7 +29,7 @@ abstract class IrValueParameter : IrValueDeclaration(), IrSymbolDeclaration<IrVa
abstract override val descriptor: ParameterDescriptor abstract override val descriptor: ParameterDescriptor
abstract val index: Int abstract val index: Int
abstract val varargElementType: IrType? abstract var varargElementType: IrType?
abstract val isCrossinline: Boolean abstract val isCrossinline: Boolean
abstract val isNoinline: Boolean abstract val isNoinline: Boolean
// if true parameter is not included into IdSignature. // if true parameter is not included into IdSignature.