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

Don't wrap return and error expressions into returns

Browse Source
This commit is contained in:
Michael Bogdanov
2016-10-05 16:31:54 +03:00
committed by Dmitry Petrov
parent 72eb317164
commit 6bd27e52bc
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/BodyGenerator.kt
+6 -1
View File
@@ -105,7 +105,12 @@ class BodyGenerator(val scopeOwner: DeclarationDescriptor, override val context:
} }
} }
private fun IrExpression.wrapWithReturn() = generateReturnExpression(startOffset, endOffset, this) private fun IrExpression.wrapWithReturn() =
if (this is IrReturn || this is IrErrorExpression || this is IrThrow)
this
else {
generateReturnExpression(startOffset, endOffset, this) }
private fun generateReturnExpression(startOffset: Int, endOffset: Int, returnValue: IrExpression): IrReturnImpl { private fun generateReturnExpression(startOffset: Int, endOffset: Int, returnValue: IrExpression): IrReturnImpl {
val returnTarget = (scopeOwner as? CallableDescriptor) ?: val returnTarget = (scopeOwner as? CallableDescriptor) ?: