Skip to content

[release/7.0] [wasm][debugger] fixing setting a breakpoint in an invalid IL offset after hotreload #75564

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Sep 14, 2022
Merged

[release/7.0] [wasm][debugger] fixing setting a breakpoint in an invalid IL offset after hotreload #75564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a92e44e
fixing setting a breakpoint in an invalid IL offset
thaystg Sep 13, 2022
013c6c5
addressing @radical comments
thaystg Sep 13, 2022
50f6014
Update src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs
thaystg Sep 13, 2022
273c0dc
Update src/mono/wasm/debugger/BrowserDebugProxy/MonoSDBHelper.cs
thaystg Sep 13, 2022
d8a6a1c
addressing @radical comments
thaystg Sep 13, 2022
b28920d
addressing @radical comments
thaystg Sep 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 38 additions & 27 deletions src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,37 +361,44 @@ protected override async Task<bool> AcceptCommand(MessageId id, JObject parms, C
SendResponse(id, resp, token);
return true;
}
try
{
string bpid = resp.Value["breakpointId"]?.ToString();
IEnumerable<object> locations = resp.Value["locations"]?.Values<object>();
var request = BreakpointRequest.Parse(bpid, args);

string bpid = resp.Value["breakpointId"]?.ToString();
IEnumerable<object> locations = resp.Value["locations"]?.Values<object>();
var request = BreakpointRequest.Parse(bpid, args);
// is the store done loading?
bool loaded = context.Source.Task.IsCompleted;
if (!loaded)
{
// Send and empty response immediately if not
// and register the breakpoint for resolution
context.BreakpointRequests[bpid] = request;
SendResponse(id, resp, token);
}

// is the store done loading?
bool loaded = context.Source.Task.IsCompleted;
if (!loaded)
{
// Send and empty response immediately if not
// and register the breakpoint for resolution
context.BreakpointRequests[bpid] = request;
SendResponse(id, resp, token);
}
if (await IsRuntimeAlreadyReadyAlready(id, token))
{
DebugStore store = await RuntimeReady(id, token);

if (await IsRuntimeAlreadyReadyAlready(id, token))
{
DebugStore store = await RuntimeReady(id, token);
Log("verbose", $"BP req {args}");
await SetBreakpoint(id, store, request, !loaded, false, token);
}

Log("verbose", $"BP req {args}");
await SetBreakpoint(id, store, request, !loaded, false, token);
}
if (loaded)
{
// we were already loaded so we should send a response
// with the locations included and register the request
context.BreakpointRequests[bpid] = request;
var result = Result.OkFromObject(request.AsSetBreakpointByUrlResponse(locations));
SendResponse(id, result, token);

if (loaded)
}
}
catch (Exception e)
{
// we were already loaded so we should send a response
// with the locations included and register the request
context.BreakpointRequests[bpid] = request;
var result = Result.OkFromObject(request.AsSetBreakpointByUrlResponse(locations));
SendResponse(id, result, token);

logger.LogDebug($"Debugger.setBreakpointByUrl - {args} - failed with exception: {e}");
SendResponse(id, Result.Err($"Debugger.setBreakpointByUrl - {args} - failed with exception: {e}"), token);
}
return true;
}
Expand Down Expand Up @@ -1449,7 +1456,8 @@ private async Task<Breakpoint> SetMonoBreakpoint(SessionId sessionId, string req

var assembly_id = await context.SdbAgent.GetAssemblyId(asm_name, token);
var methodId = await context.SdbAgent.GetMethodIdByToken(assembly_id, method_token, token);
var breakpoint_id = await context.SdbAgent.SetBreakpoint(methodId, il_offset, token);
//the breakpoint can be invalid because a race condition between the changes already applied on runtime and not applied yet on debugger side
var breakpoint_id = await context.SdbAgent.SetBreakpointNoThrow(methodId, il_offset, token);

if (breakpoint_id > 0)
{
Expand Down Expand Up @@ -1726,7 +1734,10 @@ private async Task<bool> OnSetNextIP(MessageId sessionId, SourceLocation targetL
if (!ret)
return false;

var breakpointId = await context.SdbAgent.SetBreakpoint(scope.Method.DebugId, ilOffset.Offset, token);
var breakpointId = await context.SdbAgent.SetBreakpointNoThrow(scope.Method.DebugId, ilOffset.Offset, token);
if (breakpointId == -1)
return false;

context.TempBreakpointForSetNextIP = breakpointId;
await SendResume(sessionId, token);
return true;
Expand Down
6 changes: 4 additions & 2 deletions src/mono/wasm/debugger/BrowserDebugProxy/MonoSDBHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1356,7 +1356,7 @@ public async Task<string> GetParameters(int methodId, CancellationToken token)
return parameters;
}

public async Task<int> SetBreakpoint(int methodId, long il_offset, CancellationToken token)
public async Task<int> SetBreakpointNoThrow(int methodId, long il_offset, CancellationToken token)
{
using var commandParamsWriter = new MonoBinaryWriter();
commandParamsWriter.Write((byte)EventKind.Breakpoint);
Expand All @@ -1365,7 +1365,9 @@ public async Task<int> SetBreakpoint(int methodId, long il_offset, CancellationT
commandParamsWriter.Write((byte)ModifierKind.LocationOnly);
commandParamsWriter.Write(methodId);
commandParamsWriter.Write(il_offset);
using var retDebuggerCmdReader = await SendDebuggerAgentCommand(CmdEventRequest.Set, commandParamsWriter, token);
using var retDebuggerCmdReader = await SendDebuggerAgentCommand(CmdEventRequest.Set, commandParamsWriter, token, throwOnError: false);
if (retDebuggerCmdReader.HasError)
return -1;
return retDebuggerCmdReader.ReadInt32();
}

Expand Down