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

[release/5.0] Browser support for Debugger::Break. #45038

Merged
merged 3 commits into from
Nov 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions src/mono/mono/mini/mini-wasm-debugger.c
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,7 @@ mono_wasm_debugger_init (void)
objrefs = g_hash_table_new_full (NULL, NULL, NULL, mono_debugger_free_objref);

mini_get_dbg_callbacks ()->handle_exception = handle_exception;
mini_get_dbg_callbacks ()->user_break = mono_wasm_user_break;
}

MONO_API void
Expand Down Expand Up @@ -626,6 +627,12 @@ mono_wasm_breakpoint_hit (void)
// mono_wasm_fire_bp ();
}

void
mono_wasm_user_break (void)
{
mono_wasm_fire_bp ();
}

EMSCRIPTEN_KEEPALIVE int
mono_wasm_current_bp_id (void)
{
Expand Down
1 change: 1 addition & 0 deletions src/mono/mono/mini/mini-wasm.h
Original file line number Diff line number Diff line change
Expand Up @@ -111,5 +111,6 @@ void mono_wasm_set_timeout (int timeout, int id);

void mono_wasm_single_step_hit (void);
void mono_wasm_breakpoint_hit (void);
void mono_wasm_user_break (void);

#endif /* __MONO_MINI_WASM_H__ */
19 changes: 18 additions & 1 deletion src/mono/wasm/debugger/DebuggerTestSuite/Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1984,10 +1984,27 @@ async Task LoadAssemblyDynamically(string asm_file, string pdb_file)
}

[Fact]
public async Task StepOverHiddenSequencePoint()
public async Task BreakOnDebuggerBreak()
{
var insp = new Inspector();
//Collect events
var scripts = SubscribeToScripts(insp);

await Ready();
await insp.Ready(async (cli, token) =>
{
ctx = new DebugTestContext(cli, insp, token, scripts);
await EvaluateAndCheck(
"window.setTimeout(function() { invoke_static_method_async('[debugger-test] UserBreak:BreakOnDebuggerBreakCommand'); }, 1);",
"dotnet://debugger-test.dll/debugger-test2.cs", 54, 4,
"BreakOnDebuggerBreakCommand");
});
}

[Fact]
public async Task StepOverHiddenSequencePoint()
{
var insp = new Inspector();
//Collect events
var scripts = SubscribeToScripts(insp);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

using System;

using System.Diagnostics;
public class Misc
{ //Only append content to this class as the test suite depends on line info
public static int CreateObject(int foo, int bar)
Expand Down Expand Up @@ -49,3 +49,10 @@ public static void Types()
var d = usMin + usMax;
}
}

public class UserBreak {
public static void BreakOnDebuggerBreakCommand()
{
Debugger.Break();
}
}