[kotlin][debugger] Add support for removed line numbers from lambdas with parameter destructuring #2834
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…n the Kotlin debugger Previously there was no capability to set different expectations for evaluate expression results when compiling with K1 and K2. At the same time, we can differentiate test outputs with '.out' and '.k2.out' suffixes. So it makes sense to add the same differentiation capability for evaluation.
…er destructuring
This commit only works in pair with the corresponding change in the Kotlin compiler, that erases line numbers set on parameter destructuring opcodes in lambdas. The only difference on the debugger side is the removal of a condition that filters inline function borders with the same source file name. To explain why this is needed let's take a look at a sample bytecode of a lambda with parameter destructuring:
```
private static final kotlin.Unit main$lambda$0(A);
// Fake line number with source 'fake.kt' can be inserted here
// $i$a$... starts here
// START OF DESTRUCTURING
...
// END OF DESTRUCURING
// First line number in the method goes here
...
```
Let's suppose it was inlined like this:
```
inline fun foo(...)
foo { (x, y) -> ... }
```
The `$i$a$foo` variable that captures borders of the inlined lambda will start right before the parameters are destructured, however since there is no dedicated line number at the start of lambda, the source file of the start of the border will be 'fake.kt'. This situation was not possible before so the condition that was removed really didn't do anything.
…turing This commit only works in pair with the corresponding change in the Kotlin compiler, that erases line numbers set on parameter destructuring opcodes in lambdas. It introduces a heuristic that corrects stepping into lambdas with parameter destructuring.
nikita-nazarov
commented
Aug 21, 2024
| @@ -3,7 +3,7 @@ Run Java | |||
| Connected to the target VM | |||
| stepIntoStdlibFacadeClass.kt:6 | |||
| _Arrays.!EXT! | |||
| Intrinsics.!EXT! | |||
There was a problem hiding this comment.
Unfortunately, I couldn't understand what has actually changed in this test. I couldn't reproduce the original output in Intellij.
There was a problem hiding this comment.
It looks like it is affected by this code:
if (location != null && location.isMethodEntryLocationWithoutLineNumber()) {
currentSteppingSize = StepRequest.STEP_MIN
return StepRequest.STEP_OVER
}
You were not able to reproduce the error, because val DISABLE_KOTLIN_INTERNAL_CLASSES by debuggerPreferenceKey(false) is disabled by default in tests
There was a problem hiding this comment.
Anyway, isMethodEntryLocationWithoutLineNumber seems not enough to limit the fix to parameter destruction only. However, this does not look bad unless this flag is disabled, as only generated code should be located before the first line
zuevmaxim
reviewed
Aug 26, 2024
.../jvm-debugger/core/src/org/jetbrains/kotlin/idea/debugger/core/stepping/KotlinRequestHint.kt
Outdated
Show resolved
Hide resolved
...s/test/org/jetbrains/kotlin/asJava/classes/IdeCompiledLightClassesByFqNameTestGenerated.java
Outdated
Show resolved
Hide resolved
...otlin/jvm-debugger/core/src/org/jetbrains/kotlin/idea/debugger/core/KotlinPositionManager.kt
Show resolved
Hide resolved
…parameter destructuring
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request adds debugger support for new debug info format for lambdas with parameter destructuring. In the new format line numbers will not be added for the part where destructuring happens.
Corresponding issue: https://youtrack.jetbrains.com/issue/IDEA-335314/Debugger-destructured-parameters-are-not-visible-when-stepping-into-a-lambda
Compiler side pr: https://kotlin.jetbrains.space/p/kotlin/reviews/1150/timeline