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

IR. Hack to distinguish default values

Browse Source
This commit is contained in:
Mikhael Bogdanov
2019-11-15 14:50:20 +01:00
parent ac31e0e8c7
commit abef5daea9
3 changed files with 13 additions and 3 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
+9 -1
View File
@@ -290,7 +290,15 @@ open class DefaultParameterInjector(
if (valueArgument == null) { if (valueArgument == null) {
maskValues[i / 32] = maskValues[i / 32] or (1 shl (i % 32)) maskValues[i / 32] = maskValues[i / 32] or (1 shl (i % 32))
} }
valueArgument ?: nullConst(startOffset, endOffset, parameter) valueArgument ?: nullConst(startOffset, endOffset, parameter)?.let {
IrCompositeImpl(
expression.startOffset,
expression.endOffset,
parameter.type,
IrStatementOrigin.DEFAULT_VALUE,
listOf(it)
)
}
} }
} }
} }
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/IrInlineCodegen.kt
+3 -2
View File
@@ -97,8 +97,9 @@ class IrInlineCodegen(
val kind = when (irValueParameter.origin) { val kind = when (irValueParameter.origin) {
IrDeclarationOrigin.MASK_FOR_DEFAULT_FUNCTION -> ValueKind.DEFAULT_MASK IrDeclarationOrigin.MASK_FOR_DEFAULT_FUNCTION -> ValueKind.DEFAULT_MASK
IrDeclarationOrigin.METHOD_HANDLER_IN_DEFAULT_FUNCTION -> ValueKind.METHOD_HANDLE_IN_DEFAULT IrDeclarationOrigin.METHOD_HANDLER_IN_DEFAULT_FUNCTION -> ValueKind.METHOD_HANDLE_IN_DEFAULT
//TODO: support DEFAULT_PARAMETER else -> if (argumentExpression is IrContainerExpression && argumentExpression.origin == IrStatementOrigin.DEFAULT_VALUE)
else -> ValueKind.CAPTURED ValueKind.DEFAULT_PARAMETER
else ValueKind.CAPTURED
} }
val onStack = when { val onStack = when {
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/IrStatementOrigin.kt
+1
View File
@@ -86,6 +86,7 @@ interface IrStatementOrigin {
object FOR_LOOP_NEXT : IrStatementOriginImpl("FOR_LOOP_NEXT") object FOR_LOOP_NEXT : IrStatementOriginImpl("FOR_LOOP_NEXT")
object LAMBDA : IrStatementOriginImpl("LAMBDA") object LAMBDA : IrStatementOriginImpl("LAMBDA")
object DEFAULT_VALUE : IrStatementOriginImpl("DEFAULT_VALUE")
object ANONYMOUS_FUNCTION : IrStatementOriginImpl("ANONYMOUS_FUNCTION") object ANONYMOUS_FUNCTION : IrStatementOriginImpl("ANONYMOUS_FUNCTION")
object OBJECT_LITERAL : IrStatementOriginImpl("OBJECT_LITERAL") object OBJECT_LITERAL : IrStatementOriginImpl("OBJECT_LITERAL")