[IR] Make isHidden and isAssignable explicit on IrValueParameter.

There were a couple of places where they were confused and
isAssignable was passed as a positional parameter in the position
of isHidden.
This commit is contained in:
Mads Ager
2020-11-27 12:17:59 +01:00
committed by Alexander Udalov
parent 3dbe02b7fe
commit 5d9e86863a
21 changed files with 44 additions and 25 deletions
@@ -199,8 +199,8 @@ interface IrFactory {
varargElementType: IrType?,
isCrossinline: Boolean,
isNoinline: Boolean,
isHidden: Boolean = false,
isAssignable: Boolean = false
isHidden: Boolean,
isAssignable: Boolean
): IrValueParameter
// Bodies
@@ -32,7 +32,8 @@ interface IrLazyDeclarationBase : IrDeclaration {
fun ReceiverParameterDescriptor.generateReceiverParameterStub(): IrValueParameter =
factory.createValueParameter(
UNDEFINED_OFFSET, UNDEFINED_OFFSET, origin, IrValueParameterSymbolImpl(this),
name, -1, type.toIrType(), null, isCrossinline = false, isNoinline = false, isAssignable = false
name, -1, type.toIrType(), null, isCrossinline = false, isNoinline = false,
isHidden = false, isAssignable = false
)
fun generateMemberStubs(memberScope: MemberScope, container: MutableList<IrDeclaration>) {
@@ -80,7 +80,7 @@ class IrBuiltIns(
val valueParameterSymbol = IrValueParameterSymbolImpl(valueParameterDescriptor)
irFactory.createValueParameter(
UNDEFINED_OFFSET, UNDEFINED_OFFSET, BUILTIN_OPERATOR, valueParameterSymbol, Name.identifier("arg$i"), i,
valueParameterType, null, isCrossinline = false, isNoinline = false, isAssignable = false
valueParameterType, null, isCrossinline = false, isNoinline = false, isHidden = false, isAssignable = false
).apply {
parent = operator
}
@@ -165,7 +165,7 @@ class IrBuiltIns(
val valueParameterSymbol = IrValueParameterSymbolImpl(valueParameterDescriptor)
val valueParameter = irFactory.createValueParameter(
UNDEFINED_OFFSET, UNDEFINED_OFFSET, BUILTIN_OPERATOR, valueParameterSymbol, Name.identifier("arg0"), 0,
valueIrType, null, isCrossinline = false, isNoinline = false, isAssignable = false
valueIrType, null, isCrossinline = false, isNoinline = false, isHidden = false, isAssignable = false
)
valueParameter.parent = operator
@@ -269,6 +269,7 @@ class IrFunctionFactory(private val irBuiltIns: IrBuiltIns, private val symbolTa
offset, offset, classOrigin, vSymbol, Name.special("<this>"), -1, type, null,
isCrossinline = false,
isNoinline = false,
isHidden = false,
isAssignable = false
)
@@ -334,6 +335,7 @@ class IrFunctionFactory(private val irBuiltIns: IrBuiltIns, private val symbolTa
offset, offset, memberOrigin, vSymbol, Name.identifier("p$i"), i - 1, vType, null,
isCrossinline = false,
isNoinline = false,
isHidden = false,
isAssignable = false
)
vDeclaration.parent = fDeclaration
@@ -366,7 +368,7 @@ class IrFunctionFactory(private val irBuiltIns: IrBuiltIns, private val symbolTa
private fun IrFunction.createValueParameter(descriptor: ParameterDescriptor): IrValueParameter = with(descriptor) {
irFactory.createValueParameter(
offset, offset, memberOrigin, IrValueParameterSymbolImpl(this), name, indexOrMinusOne, toIrType(type),
(this as? ValueParameterDescriptor)?.varargElementType?.let(::toIrType), isCrossinline, isNoinline
(this as? ValueParameterDescriptor)?.varargElementType?.let(::toIrType), isCrossinline, isNoinline, false, false
).also {
it.parent = this@createValueParameter
}
@@ -96,7 +96,8 @@ class FakeOverrideCopier(
declaration.varargElementType?.remapType(),
declaration.isCrossinline,
declaration.isNoinline,
false
declaration.isHidden,
declaration.isAssignable
).apply {
transformAnnotations(declaration)
// Don't set the default value for fake overrides.
@@ -246,7 +246,7 @@ class DeclarationStubGenerator(
internal fun generateValueParameterStub(descriptor: ValueParameterDescriptor): IrValueParameter = with(descriptor) {
symbolTable.irFactory.createValueParameter(
UNDEFINED_OFFSET, UNDEFINED_OFFSET, computeOrigin(this), IrValueParameterSymbolImpl(this), name, index, type.toIrType(),
varargElementType?.toIrType(), isCrossinline, isNoinline, false
varargElementType?.toIrType(), isCrossinline, isNoinline, isHidden = false, isAssignable = false
).also { irValueParameter ->
if (descriptor.declaresDefaultValue()) {
irValueParameter.defaultValue =
@@ -351,6 +351,7 @@ open class DeepCopyIrTreeWithSymbols(
declaration.varargElementType?.remapType(),
declaration.isCrossinline,
declaration.isNoinline,
declaration.isHidden,
declaration.isAssignable
).apply {
transformAnnotations(declaration)
@@ -901,7 +901,8 @@ class SymbolTable(
valueParameterFactory: (IrValueParameterSymbol) -> IrValueParameter = {
irFactory.createValueParameter(
startOffset, endOffset, origin, it, name ?: nameProvider.nameForDeclaration(descriptor),
descriptor.indexOrMinusOne, type, varargElementType, descriptor.isCrossinline, descriptor.isNoinline, false
descriptor.indexOrMinusOne, type, varargElementType, descriptor.isCrossinline, descriptor.isNoinline,
isHidden = false, isAssignable = false
)
}
): IrValueParameter =