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

IR: default arguments support 32+ arguments with default values

Browse Source
This commit is contained in:
Vasily Levchenko
2017-02-22 11:23:09 +03:00
committed by vvlevchenko
parent 42b644b45e
commit c5fe02f537
1 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/DefaultArgumentStubGenerator.kt
+25 -19
View File
@@ -82,8 +82,8 @@ class DefaultArgumentStubGenerator internal constructor(val context: Context): D
if (valueParameter.hasDefaultValue()) { if (valueParameter.hasDefaultValue()) {
val condition = irNotEquals(irCall(Helper.kIntAnd).apply { val condition = irNotEquals(irCall(Helper.kIntAnd).apply {
dispatchReceiver = irGet(maskParameterDescriptor(descriptor)) dispatchReceiver = irGet(maskParameterDescriptor(descriptor, valueParameter.index / 32))
putValueArgument(0, irInt(1 shl valueParameter.index)) putValueArgument(0, irInt(1 shl (valueParameter.index % 32)))
}, irInt(0)) }, irInt(0))
val expressionBody = getDefaultParameterExpressionBody(irFunction, valueParameter) val expressionBody = getDefaultParameterExpressionBody(irFunction, valueParameter)
@@ -184,7 +184,7 @@ private fun getDefaultParameterExpressionBody(irFunction: IrFunction, valueParam
return irFunction.getDefault(valueParameter) as? IrExpressionBody ?: TODO("FIXME!!!") return irFunction.getDefault(valueParameter) as? IrExpressionBody ?: TODO("FIXME!!!")
} }
private fun maskParameterDescriptor(descriptor: FunctionDescriptor) = descriptor.valueParameters.single { it.name == Helper.kParameterMaskName } private fun maskParameterDescriptor(descriptor: FunctionDescriptor, number:Int)= descriptor.valueParameters.single { it.name == parameterMaskName(number) }
private fun markerParameterDescriptor(descriptor: FunctionDescriptor) = descriptor.valueParameters.single {it.name == Helper.kConstructorMarkerName} private fun markerParameterDescriptor(descriptor: FunctionDescriptor) = descriptor.valueParameters.single {it.name == Helper.kConstructorMarkerName}
@@ -272,27 +272,31 @@ class DefaultParameterInjector internal constructor(val context: Context): BodyL
val realDescriptor = keyDescriptor.generateDefaultsDescription(context) val realDescriptor = keyDescriptor.generateDefaultsDescription(context)
log("$descriptor -> $realDescriptor") log("$descriptor -> $realDescriptor")
var maskValue = 0 val maskValues = Array(descriptor.valueParameters.size / 32 + 1, {0})
val params = mutableListOf<Pair<ValueParameterDescriptor, IrExpression?>>() val params = mutableListOf<Pair<ValueParameterDescriptor, IrExpression?>>()
params.addAll(descriptor.valueParameters.mapIndexed { i, _ -> params.addAll(descriptor.valueParameters.mapIndexed { i, _ ->
val valueArgument = expression.getValueArgument(i) val valueArgument = expression.getValueArgument(i)
if (valueArgument == null) maskValue = maskValue or (1 shl i) if (valueArgument == null) {
val maskIndex = i / 32
maskValues[maskIndex] = maskValues[maskIndex] or (1 shl (i % 32))
}
val valueParameterDescriptor = realDescriptor.valueParameters[i] val valueParameterDescriptor = realDescriptor.valueParameters[i]
val pair = valueParameterDescriptor to (valueArgument ?: nullConst(expression, valueParameterDescriptor.type)) val pair = valueParameterDescriptor to (valueArgument ?: nullConst(expression, valueParameterDescriptor.type))
return@mapIndexed pair return@mapIndexed pair
}) })
params += maskParameterDescriptor(realDescriptor) to IrConstImpl<Int>( maskValues.forEachIndexed { i, maskValue ->
startOffset = irBody.startOffset, params += maskParameterDescriptor(realDescriptor, i) to IrConstImpl.int(
endOffset = irBody.endOffset, startOffset = irBody.startOffset,
type = KonanPlatform.builtIns.intType, endOffset = irBody.endOffset,
kind = IrConstKind.Int, type = KonanPlatform.builtIns.intType,
value = maskValue) value = maskValue)
}
if (expression.descriptor is ClassConstructorDescriptor) { if (expression.descriptor is ClassConstructorDescriptor) {
params += markerParameterDescriptor(realDescriptor) to IrGetObjectValueImpl( params += markerParameterDescriptor(realDescriptor) to IrGetObjectValueImpl(
irBody.startOffset, startOffset = irBody.startOffset,
irBody.endOffset, endOffset = irBody.endOffset,
Helper.kDefaultArgumentMarkerClassDescriptor.defaultType, type = Helper.kDefaultArgumentMarkerClassDescriptor.defaultType,
Helper.kDefaultArgumentMarkerClassDescriptor) descriptor = Helper.kDefaultArgumentMarkerClassDescriptor)
} }
params.forEach { params.forEach {
log("descriptor::${realDescriptor.name.asString()}#${it.first.index}: ${it.first.name.asString()}") log("descriptor::${realDescriptor.name.asString()}#${it.first.index}: ${it.first.name.asString()}")
@@ -333,7 +337,9 @@ private fun FunctionDescriptor.generateDefaultsDescription(context: Context): Fu
else -> TODO("FIXME: $this") else -> TODO("FIXME: $this")
} }
val syntheticParameters = mutableListOf(valueParameter(descriptor, valueParameters.size, Helper.kParameterMaskName, KonanPlatform.builtIns.intType)) val syntheticParameters = mutableListOf<ValueParameterDescriptor>(*Array(valueParameters.size / 32 + 1, {
valueParameter(descriptor, valueParameters.size + it, parameterMaskName(it), KonanPlatform.builtIns.intType)
}))
if (this is ClassConstructorDescriptor) { if (this is ClassConstructorDescriptor) {
syntheticParameters += valueParameter(descriptor, syntheticParameters.last().index + 1, syntheticParameters += valueParameter(descriptor, syntheticParameters.last().index + 1,
Helper.kConstructorMarkerName, Helper.kConstructorMarkerName,
@@ -402,10 +408,10 @@ internal object Helper {
val kKonanInternalPackageDescriptor = KonanPlatform.builtIns.builtInsModule.getPackage(FqName("konan.internal")) val kKonanInternalPackageDescriptor = KonanPlatform.builtIns.builtInsModule.getPackage(FqName("konan.internal"))
val kDefaultArgumentMarkerName = Name.identifier("DefaultArgumentMarker") val kDefaultArgumentMarkerName = Name.identifier("DefaultArgumentMarker")
val kParameterMaskName = Name.identifier("__\$mask\$__") val kConstructorMarkerName = "marker".synthesizedName
val kConstructorMarkerName = Name.identifier("__\$marker\$__")
val kDefaultArgumentMarkerClassDescriptor = DescriptorUtils.getAllDescriptors(kKonanInternalPackageDescriptor.memberScope) val kDefaultArgumentMarkerClassDescriptor = DescriptorUtils.getAllDescriptors(kKonanInternalPackageDescriptor.memberScope)
.first{ it is ClassDescriptor && it.name == kDefaultArgumentMarkerName} as ClassDescriptor .first{ it is ClassDescriptor && it.name == kDefaultArgumentMarkerName} as ClassDescriptor
} }
internal fun IrBuilderWithScope.irGet(descriptor: ReceiverParameterDescriptor):IrGetValue = IrGetValueImpl(startOffset, endOffset, descriptor) internal fun IrBuilderWithScope.irGet(descriptor: ReceiverParameterDescriptor):IrGetValue = IrGetValueImpl(startOffset, endOffset, descriptor)
private fun parameterMaskName(number: Int) = "mask$number".synthesizedName