Skip to content

[wasm][debugger] Do not pause on exceptions from our framework js files if JMC is enabled #89741

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 3 commits into from
Aug 2, 2023
Merged

[wasm][debugger] Do not pause on exceptions from our framework js files if JMC is enabled #89741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e17b1bc
avoid pausing on exceptions from framework js files if JMC is enabled
thaystg Jul 31, 2023
4760ad0
using one if
thaystg Jul 31, 2023
7ef1011
Fix test failure
thaystg Aug 1, 2023
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
3 changes: 3 additions & 0 deletions src/mono/wasm/debugger/BrowserDebugProxy/DevToolsHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,7 @@ public ExecutionContext(MonoSDBHelper sdbAgent, int id, object auxData, PauseOnE
SdbAgent = sdbAgent;
PauseOnExceptions = pauseOnExceptions;
Destroyed = false;
FrameworkScriptList = new();
}
public ExecutionContext CreateChildAsyncExecutionContext(SessionId sessionId)
=> new ExecutionContext(null, Id, AuxData, PauseOnExceptions)
Expand Down Expand Up @@ -434,6 +435,8 @@ public bool CopyDataFromParentContext()
public int ThreadId { get; set; }
public int Id { get; set; }
public ExecutionContext ParentContext { get; private set; }

public List<int> FrameworkScriptList { get; init; }
public SessionId SessionId { get; private set; }

public bool PausedOnWasm { get; set; }
Expand Down
30 changes: 25 additions & 5 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 @@ -148,7 +148,15 @@ protected override async Task<bool> AcceptEvent(SessionId sessionId, JObject par
Contexts.ClearContexts(sessionId);
return false;
}

case "Debugger.scriptParsed":
{
if (args["url"]?.ToString()?.Contains("/_framework/") == true) //is from dotnet runtime framework
{
if (Contexts.TryGetCurrentExecutionContextValue(sessionId, out ExecutionContext context))
context.FrameworkScriptList.Add(args["scriptId"].Value<int>());
}
return false;
}
case "Debugger.paused":
{
return await OnDebuggerPaused(sessionId, args, token);
Expand Down Expand Up @@ -237,11 +245,23 @@ protected async Task<bool> OnDebuggerPaused(SessionId sessionId, JObject args, C
}
default:
{
//avoid pausing when justMyCode is enabled and it's a wasm function
if (JustMyCode && args?["callFrames"]?[0]?["scopeChain"]?[0]?["type"]?.Value<string>()?.Equals("wasm-expression-stack") == true)
if (JustMyCode)
{
await SendCommand(sessionId, "Debugger.stepOut", new JObject(), token);
return true;
if (!Contexts.TryGetCurrentExecutionContextValue(sessionId, out ExecutionContext context))
return false;
//avoid pausing when justMyCode is enabled and it's a wasm function
if (args?["callFrames"]?[0]?["scopeChain"]?[0]?["type"]?.Value<string>()?.Equals("wasm-expression-stack") == true)
{
await SendCommand(sessionId, "Debugger.stepOut", new JObject(), token);
return true;
}
//avoid pausing when justMyCode is enabled and it's a framework function
var scriptId = args?["callFrames"]?[0]?["location"]?["scriptId"]?.Value<int>();
if (!context.IsSkippingHiddenMethod && !context.IsSteppingThroughMethod && scriptId is not null && context.FrameworkScriptList.Contains(scriptId.Value))
{
await SendCommand(sessionId, "Debugger.stepOut", new JObject(), token);
return true;
}
}
break;
}
Expand Down