Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[wasm][debugger] Fix line number = 16777215 #42640

Merged
merged 6 commits into from
Sep 24, 2020

Conversation

thaystg
Copy link
Member

@thaystg thaystg commented Sep 23, 2020

If sp.Offset > pos and it's a hidden breakpoint this is the line number that would be visible in the call stack, so skipping hidden breakpoints would avoid it.

@ghost
Copy link

ghost commented Sep 23, 2020

Tagging subscribers to this area: @thaystg
See info in area-owners.md if you want to be subscribed.

Copy link
Member

@lewing lewing left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@thaystg and I discussed this and did some reading and she is working on a slightly different version of this change.

lewing
lewing previously approved these changes Sep 23, 2020
Copy link
Member

@lewing lewing left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@lewing lewing dismissed their stale review September 23, 2020 20:47

Needs a test case

@thaystg
Copy link
Member Author

thaystg commented Sep 24, 2020

Looks good to me.

Test case added.

Copy link
Member

@lewing lewing left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! Passed local testing.

@radical radical added the arch-wasm WebAssembly architecture label Sep 24, 2020
@thaystg thaystg merged commit b36bb89 into dotnet:master Sep 24, 2020
@thaystg
Copy link
Member Author

thaystg commented Sep 24, 2020

/backport to release/5.0-rc2

@github-actions
Copy link
Contributor

Started backporting to release/5.0-rc2: https://github.com/dotnet/runtime/actions/runs/271228592

@github-actions
Copy link
Contributor

@thaystg backporting to release/5.0-rc2 failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: Fix line number = 16777215.
error: sha1 information is lacking or useless (src/mono/wasm/debugger/BrowserDebugProxy/DebugStore.cs).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix line number = 16777215.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
arch-wasm WebAssembly architecture area-Debugger-mono
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants