Skip to content

[release/6.0] [wasm][debugger] Clear cache after don't stop in a conditional breakpoint #58910

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 2 commits into from
Sep 13, 2021
+142 −0
Merged

[release/6.0] [wasm][debugger] Clear cache after don't stop in a conditional breakpoint #58910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da89542
Clear cache after don't stop in a conditional breakpoint. Fixes https…
thaystg Sep 9, 2021
5aaf744
Adding more tests as suggested by @radical.
thaystg Sep 10, 2021
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
1 change: 1 addition & 0 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 @@ -828,6 +828,7 @@ private async Task<bool> SendCallStack(SessionId sessionId, ExecutionContext con
});
if (!await EvaluateCondition(sessionId, context, context.CallStack.First(), bp, token))
{
context.ClearState();
await SendCommand(sessionId, "Debugger.resume", new JObject(), token);
return true;
}
Expand Down
129 changes: 129 additions & 0 deletions src/mono/wasm/debugger/DebuggerTestSuite/BreakpointTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,5 +448,134 @@ await StepAndCheck(StepKind.Over, "dotnet://ApplyUpdateReferencedAssembly.dll/Me
pause_location = await SendCommandAndCheck(JObject.FromObject(new { }), "Debugger.resume", "dotnet://ApplyUpdateReferencedAssembly.dll/MethodBody1.cs", 38, 8, "StaticMethod4");
locals = await GetProperties(pause_location["callFrames"][0]["callFrameId"].Value<string>());
}

[Fact]
public async Task ConditionalBreakpointInALoop()
{
var bp_conditional = await SetBreakpointInMethod("debugger-test.dll", "LoopClass", "LoopToBreak", 4, condition:"i == 3");
var bp_check = await SetBreakpointInMethod("debugger-test.dll", "LoopClass", "LoopToBreak", 5);
await EvaluateAndCheck(
"window.setTimeout(function() { invoke_static_method('[debugger-test] LoopClass:LoopToBreak'); }, 1);",
"dotnet://debugger-test.dll/debugger-test.cs",
bp_conditional.Value["locations"][0]["lineNumber"].Value<int>(),
bp_conditional.Value["locations"][0]["columnNumber"].Value<int>(),
"LoopToBreak",
locals_fn: (locals) =>
{
CheckNumber(locals, "i", 3);
}
);

await SendCommandAndCheck(null, "Debugger.resume",
null,
bp_check.Value["locations"][0]["lineNumber"].Value<int>(),
bp_check.Value["locations"][0]["columnNumber"].Value<int>(),
"LoopToBreak");
}

[Fact]
public async Task ConditionalBreakpointInALoopStopMoreThanOnce()
{
var bp_conditional = await SetBreakpointInMethod("debugger-test.dll", "LoopClass", "LoopToBreak", 4, condition:"i % 3 == 0");
var bp_check = await SetBreakpointInMethod("debugger-test.dll", "LoopClass", "LoopToBreak", 5);
await EvaluateAndCheck(
"window.setTimeout(function() { invoke_static_method('[debugger-test] LoopClass:LoopToBreak'); }, 1);",
"dotnet://debugger-test.dll/debugger-test.cs",
bp_conditional.Value["locations"][0]["lineNumber"].Value<int>(),
bp_conditional.Value["locations"][0]["columnNumber"].Value<int>(),
"LoopToBreak",
locals_fn: (locals) =>
{
CheckNumber(locals, "i", 0);
}
);

await SendCommandAndCheck(null, "Debugger.resume",
null,
bp_conditional.Value["locations"][0]["lineNumber"].Value<int>(),
bp_conditional.Value["locations"][0]["columnNumber"].Value<int>(),
"LoopToBreak",
locals_fn: (locals) =>
{
CheckNumber(locals, "i", 3);
});

await SendCommandAndCheck(null, "Debugger.resume",
null,
bp_conditional.Value["locations"][0]["lineNumber"].Value<int>(),
bp_conditional.Value["locations"][0]["columnNumber"].Value<int>(),
"LoopToBreak",
locals_fn: (locals) =>
{
CheckNumber(locals, "i", 6);
});

await SendCommandAndCheck(null, "Debugger.resume",
null,
bp_conditional.Value["locations"][0]["lineNumber"].Value<int>(),
bp_conditional.Value["locations"][0]["columnNumber"].Value<int>(),
"LoopToBreak",
locals_fn: (locals) =>
{
CheckNumber(locals, "i", 9);
});

await SendCommandAndCheck(null, "Debugger.resume",
null,
bp_check.Value["locations"][0]["lineNumber"].Value<int>(),
bp_check.Value["locations"][0]["columnNumber"].Value<int>(),
"LoopToBreak");
}

[Fact]
public async Task ConditionalBreakpointNoStopInALoop()
{
var bp_conditional = await SetBreakpointInMethod("debugger-test.dll", "LoopClass", "LoopToBreak", 4, condition:"i == \"10\"");
var bp_check = await SetBreakpointInMethod("debugger-test.dll", "LoopClass", "LoopToBreak", 5);
await EvaluateAndCheck(
"window.setTimeout(function() { invoke_static_method('[debugger-test] LoopClass:LoopToBreak'); }, 1);",
"dotnet://debugger-test.dll/debugger-test.cs",
bp_check.Value["locations"][0]["lineNumber"].Value<int>(),
bp_check.Value["locations"][0]["columnNumber"].Value<int>(),
"LoopToBreak"
);
}

[Fact]
public async Task ConditionalBreakpointNotBooleanInALoop()
{
var bp_conditional = await SetBreakpointInMethod("debugger-test.dll", "LoopClass", "LoopToBreak", 4, condition:"i + 4");
await EvaluateAndCheck(
"window.setTimeout(function() { invoke_static_method('[debugger-test] LoopClass:LoopToBreak'); }, 1);",
"dotnet://debugger-test.dll/debugger-test.cs",
bp_conditional.Value["locations"][0]["lineNumber"].Value<int>(),
bp_conditional.Value["locations"][0]["columnNumber"].Value<int>(),
"LoopToBreak",
locals_fn: (locals) =>
{
CheckNumber(locals, "i", 0);
}
);

await SendCommandAndCheck(null, "Debugger.resume",
null,
bp_conditional.Value["locations"][0]["lineNumber"].Value<int>(),
bp_conditional.Value["locations"][0]["columnNumber"].Value<int>(),
"LoopToBreak",
locals_fn: (locals) =>
{
CheckNumber(locals, "i", 1);
});

await SendCommandAndCheck(null, "Debugger.resume",
null,
bp_conditional.Value["locations"][0]["lineNumber"].Value<int>(),
bp_conditional.Value["locations"][0]["columnNumber"].Value<int>(),
"LoopToBreak",
locals_fn: (locals) =>
{
CheckNumber(locals, "i", 2);
});
}
}
}
12 changes: 12 additions & 0 deletions src/mono/wasm/debugger/tests/debugger-test/debugger-test.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -770,3 +770,15 @@ public static void CallSetValue()
}
}

public class LoopClass
{
public static void LoopToBreak()
{
for (int i = 0; i < 10; i++)
{
Console.WriteLine($"should pause only on i == 3");
}
Console.WriteLine("breakpoint to check");
}
}