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

[JVM_IR] Fix off-by-one line number error in CoroutineCodegen.

Browse Source 
Fixes KT-41957.
This commit is contained in:
Mads Ager
2020-10-13 11:38:32 +02:00
committed by Alexander Udalov
parent 13def12731
commit 17748b4499
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/CoroutineCodegen.kt
+2 -2
View File
@@ -55,12 +55,12 @@ internal fun MethodNode.acceptWithStateMachine(
val irFile = irFunction.file val irFile = irFunction.file
if (irFunction.startOffset >= 0) { if (irFunction.startOffset >= 0) {
// if it suspend function like `suspend fun foo(...)` // if it suspend function like `suspend fun foo(...)`
irFile.fileEntry.getLineNumber(irFunction.startOffset) irFile.fileEntry.getLineNumber(irFunction.startOffset) + 1
} else { } else {
val klass = classCodegen.irClass val klass = classCodegen.irClass
if (klass.startOffset >= 0) { if (klass.startOffset >= 0) {
// if it suspend lambda transformed into class `runSuspend { .... }` // if it suspend lambda transformed into class `runSuspend { .... }`
irFile.fileEntry.getLineNumber(klass.startOffset) irFile.fileEntry.getLineNumber(klass.startOffset) + 1
} else 0 } else 0
} }
} else element?.let { CodegenUtil.getLineNumberForElement(it, false) } ?: 0 } else element?.let { CodegenUtil.getLineNumberForElement(it, false) } ?: 0
idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepInto/stepIntoSuspendFunctionSimple.out
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JVM_IR
LineBreakpoint created at stepIntoSuspendFunctionSimple.kt:20 LineBreakpoint created at stepIntoSuspendFunctionSimple.kt:20
Run Java Run Java
Connected to the target VM Connected to the target VM