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

[PSI2IR] Sync start and end offsets on PSI and FIR for an implicit return inside lambdas

Browse Source
This commit is contained in:
Artem Kobzar
2024-02-27 19:25:24 +00:00
committed by Space Team
parent a582bf22e3
commit 02a78051aa
39 changed files with 20 additions and 2865 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
+4 -1
View File
@@ -69,6 +69,7 @@ internal class BodyGenerator(
context.irBuiltIns.nothingType,
ktBody::class.java.simpleName
)
// For implicit returns, use the expression endOffset to generate the expected line number for debugging.
irBlockBody.statements.add(generateReturnExpression(irBody.endOffset, irBody.endOffset, irBody))
return irBlockBody
}
@@ -81,6 +82,7 @@ internal class BodyGenerator(
val irBody = statementGenerator.generateStatement(ktBody)
irBlockBody.statements.add(
if (ktBody.isUsedAsExpression(context.bindingContext) && irBody is IrExpression)
// For implicit returns, use the expression endOffset to generate the expected line number for debugging.
generateReturnExpression(irBody.endOffset, irBody.endOffset, irBody)
else
irBody
@@ -128,7 +130,8 @@ internal class BodyGenerator(
irReturnedValue is IrExpression &&
irReturnedValue !is IrReturn && irReturnedValue !is IrThrow
) {
generateReturnExpression(irReturnedValue.startOffset, irReturnedValue.endOffset, irReturnedValue)
// For implicit returns, use the expression endOffset to generate the expected line number for debugging.
generateReturnExpression(irReturnedValue.endOffset, irReturnedValue.endOffset, irReturnedValue)
} else {
irReturnedValue
}