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

KT-16554 Local function with default arguments have no IR elements for them

Browse Source
This commit is contained in:
Dmitry Petrov
2017-03-01 10:03:36 +03:00
parent ab3681e164
commit c226707a80
3 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/LocalFunctionGenerator.kt
+14 -10
View File
@@ -40,8 +40,12 @@ class LocalFunctionGenerator(statementGenerator: StatementGenerator) : Statement
irFun.body = BodyGenerator(lambdaDescriptor, statementGenerator.context).generateLambdaBody(ktFun)
irBlock.statements.add(irFun)
irBlock.statements.add(IrCallableReferenceImpl(ktLambda.startOffset, ktLambda.endOffset, lambdaExpressionType,
lambdaDescriptor, null, IrStatementOrigin.LAMBDA))
irBlock.statements.add(
IrCallableReferenceImpl(
ktLambda.startOffset, ktLambda.endOffset, lambdaExpressionType,
lambdaDescriptor, null, IrStatementOrigin.LAMBDA
)
)
return irBlock
}
@@ -58,17 +62,17 @@ class LocalFunctionGenerator(statementGenerator: StatementGenerator) : Statement
val irFun = generateFunctionDeclaration(ktFun)
irBlock.statements.add(irFun)
irBlock.statements.add(IrCallableReferenceImpl(ktFun.startOffset, ktFun.endOffset, funExpressionType,
irFun.descriptor, null, IrStatementOrigin.ANONYMOUS_FUNCTION))
irBlock.statements.add(
IrCallableReferenceImpl(
ktFun.startOffset, ktFun.endOffset, funExpressionType,
irFun.descriptor, null, IrStatementOrigin.ANONYMOUS_FUNCTION
)
)
irBlock
}
private fun generateFunctionDeclaration(ktFun: KtNamedFunction): IrFunction {
val funDescriptor = getOrFail(BindingContext.FUNCTION, ktFun)
val irFun = IrFunctionImpl(ktFun.startOffset, ktFun.endOffset, IrDeclarationOrigin.DEFINED, funDescriptor)
irFun.body = BodyGenerator(funDescriptor, statementGenerator.context).generateFunctionBody(ktFun.bodyExpression!!)
return irFun
}
private fun generateFunctionDeclaration(ktFun: KtNamedFunction): IrFunction =
DeclarationGenerator(context).generateFunctionDeclaration(ktFun)
}
compiler/testData/ir/irText/declarations/defaultArguments.kt
Vendored
+3 -1
View File
@@ -1 +1,3 @@
fun test1(x: Int, y: Int = 0, z: String = "abc") {}
fun test1(x: Int, y: Int = 0, z: String = "abc") {
fun local(xx: Int = x, yy: Int = y, zz: String = z) {}
}
compiler/testData/ir/irText/declarations/defaultArguments.txt
Vendored
+8
View File
@@ -5,3 +5,11 @@ FILE /defaultArguments.kt
z: EXPRESSION_BODY
CONST String type=kotlin.String value='abc'
BLOCK_BODY
FUN local final fun local(xx: kotlin.Int = ..., yy: kotlin.Int = ..., zz: kotlin.String = ...): kotlin.Unit
xx: EXPRESSION_BODY
GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=null
yy: EXPRESSION_BODY
GET_VAR 'value-parameter y: Int = ...' type=kotlin.Int origin=null
zz: EXPRESSION_BODY
GET_VAR 'value-parameter z: String = ...' type=kotlin.String origin=null
BLOCK_BODY