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] Fixing async locals in nested ContinueWith blocks #56911

Merged
merged 8 commits into from
Aug 6, 2021

Conversation

thaystg
Copy link
Member

@thaystg thaystg commented Aug 5, 2021

@ghost
Copy link

ghost commented Aug 5, 2021

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

Issue Details

Adding test to close #41984

Author: thaystg
Assignees: -
Labels:

area-Debugger-mono

Milestone: -

@thaystg thaystg marked this pull request as draft August 5, 2021 21:26
@thaystg thaystg requested a review from lewing August 5, 2021 22:06
@thaystg thaystg marked this pull request as ready for review August 6, 2021 02:15
@radical radical added the arch-wasm WebAssembly architecture label Aug 6, 2021
@ghost
Copy link

ghost commented Aug 6, 2021

Tagging subscribers to 'arch-wasm': @lewing
See info in area-owners.md if you want to be subscribed.

Issue Details
Author: thaystg
Assignees: -
Labels:

arch-wasm, area-Debugger-mono

Milestone: -

Copy link
Member

@radical radical left a comment

Choose a reason for hiding this comment

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

Looking good! Just some feedback

src/mono/wasm/debugger/BrowserDebugProxy/MonoSDBHelper.cs Outdated Show resolved Hide resolved
src/mono/wasm/debugger/BrowserDebugProxy/MonoSDBHelper.cs Outdated Show resolved Hide resolved
src/mono/wasm/debugger/BrowserDebugProxy/MonoSDBHelper.cs Outdated Show resolved Hide resolved
src/mono/wasm/debugger/BrowserDebugProxy/MonoSDBHelper.cs Outdated Show resolved Hide resolved
src/mono/wasm/debugger/BrowserDebugProxy/MonoSDBHelper.cs Outdated Show resolved Hide resolved
src/mono/wasm/debugger/BrowserDebugProxy/MonoSDBHelper.cs Outdated Show resolved Hide resolved
src/mono/wasm/debugger/BrowserDebugProxy/MonoSDBHelper.cs Outdated Show resolved Hide resolved
src/mono/wasm/debugger/DebuggerTestSuite/AsyncTests.cs Outdated Show resolved Hide resolved
src/mono/wasm/debugger/DebuggerTestSuite/AsyncTests.cs Outdated Show resolved Hide resolved
@thaystg thaystg changed the title [wasm][debugger] Adding test for async locals in a ContinueWith block [wasm][debugger] Fixing async locals in nested ContinueWith blocks Aug 6, 2021
var match = regex.Match(fieldName);
if (match.Success)
asyncLocal["name"] = match.Groups[1].Value;
asyncLocalsFull.Add(asyncLocal);
Copy link
Member

Choose a reason for hiding this comment

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

Would this still be valid without a name? If not, then we shouldn't add it to asyncLocalsFull, and just skip it.

@@ -1729,14 +1786,7 @@ public async Task<JArray> StackFrameGetValues(SessionId sessionId, MethodInfo me
retDebuggerCmdReader.ReadByte(); //ignore type
var objectId = retDebuggerCmdReader.ReadInt32();
var asyncLocals = await GetObjectValues(sessionId, objectId, true, false, false, false, token);
Copy link
Member

Choose a reason for hiding this comment

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

Just curious, what does this return? reference to the generated class?

Copy link
Member

@radical radical 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, thank you! 👍

@lewing lewing merged commit c1351d6 into dotnet:main Aug 6, 2021
@lewing
Copy link
Member

lewing commented Aug 6, 2021

The changes did not impact the lanes that had failed.

@ghost ghost locked as resolved and limited conversation to collaborators Sep 7, 2021
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.

[wasm][debugger] Async locals in a ContinueWith block
3 participants