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

[JS IR BE] make default argument lowering support per-file mode

Browse Source
This commit is contained in:
Anton Bannykh
2018-10-19 18:15:40 +03:00
committed by Anton Bannykh
parent 4c30888d89
commit b83df18e22
3 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/DefaultArgumentStubGenerator.kt
+17 -17
View File
@@ -66,6 +66,23 @@ open class DefaultArgumentStubGenerator constructor(val context: CommonBackendCo
if (bodies.isEmpty()) {
// Fake override
val newIrFunction = irFunction.generateDefaultsFunction(context, IrDeclarationOrigin.FAKE_OVERRIDE)
if (irFunction is IrSimpleFunction) {
for (baseFunSymbol in irFunction.overriddenSymbols) {
val baseFun = baseFunSymbol.owner
if (baseFun.needsDefaultArgumentsLowering(skipInlineMethods)) {
val baseOrigin = if (baseFun.valueParameters.any { it.defaultValue != null }) {
DECLARATION_ORIGIN_FUNCTION_FOR_DEFAULT_PARAMETER
} else {
IrDeclarationOrigin.FAKE_OVERRIDE
}
(baseFun.generateDefaultsFunction(context, baseOrigin) as? IrSimpleFunction)?.let {
(newIrFunction as IrSimpleFunction).overriddenSymbols.add(it.symbol)
}
}
}
}
return listOf(irFunction, newIrFunction)
}
@@ -163,23 +180,6 @@ private fun maskParameter(function: IrFunction, number: Int) =
private fun markerParameterDeclaration(function: IrFunction) =
function.valueParameters.single { it.name == kConstructorMarkerName }
// Populates `overriddenSymbols` for the newly created functions
class DefaultParameterFakeOverrideCleanup(val context: CommonBackendContext): DeclarationContainerLoweringPass {
override fun lower(irDeclarationContainer: IrDeclarationContainer) {
for (func in irDeclarationContainer.declarations) {
if (func !is IrSimpleFunction) continue
val defFunc = context.ir.defaultParameterDeclarationsCache[func] as? IrSimpleFunction ?: continue
for (o in func.overriddenSymbols) {
(context.ir.defaultParameterDeclarationsCache[o.owner] as? IrSimpleFunction)?.let {
defFunc.overriddenSymbols.add(it.symbol)
}
}
}
}
}
open class DefaultParameterInjector constructor(
val context: CommonBackendContext,
private val skipInline: Boolean = true