Repository navigation
Fix statement stepping skipping return statements - #1054
Merged
Merged
Conversation
Do not skip a location if the instruction right after the load/constant is a return. Fixes eclipse-jdt#1053
Contributor
There was a problem hiding this comment.
🟢 Approval recommended
There are no active review issues for the change preserving debugger stops at return statements.
No open issues 🎉
What changed in this PR
This PR addresses #1053 by preserving stops at return statements when “Skip intermediate instructions while stepping” is enabled in the Java debugger.
Changes:
- Prevents skipping a load or constant-push instruction immediately followed by a return, accounting for instruction length.
- Adds and registers a regression test program.
- Adds a stepping test that verifies suspension at the return statement before returning to the caller.
| File | Description |
|---|---|
org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIThread.java |
Checks for return instructions before skipping a stepping location. |
org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AbstractDebugTest.java |
Registers the new test program. |
org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/test/stepping/StatementSteppingTests.java |
Verifies that stepping does not skip the return statement. |
org.eclipse.jdt.debug.tests/testprograms/StatementStepReturn.java |
Provides the conditional-return regression scenario. |
Review effort: Balanced
This file contains hidden or 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
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.
Do not skip a location if the instruction right after the load/constant is a return.
Fixes #1053
What it does
How to test
Author checklist