From fa8fb1ddfddb754dee3161e335d6a021ac6055d4 Mon Sep 17 00:00:00 2001 From: Thays Grazia Date: Thu, 24 Sep 2020 14:09:43 -0300 Subject: [PATCH] [wasm][debugger] Fixing step over in an async method (#42639) * Fixing step over in an async method. * Removing debugstore change. --- src/mono/mono/mini/debugger-engine.c | 5 ++++- src/mono/wasm/debugger/DebuggerTestSuite/SteppingTests.cs | 6 ++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/mono/mono/mini/debugger-engine.c b/src/mono/mono/mini/debugger-engine.c index c5964e0..a028ff8 100644 --- a/src/mono/mono/mini/debugger-engine.c +++ b/src/mono/mono/mini/debugger-engine.c @@ -1323,8 +1323,11 @@ mono_de_ss_start (SingleStepReq *ss_req, SingleStepArgs *ss_args) } else { frame_index = 1; +#ifndef TARGET_WASM if (ss_args->ctx && !frames) { - +#else + if (!frames) { +#endif mono_loader_lock (); locked = TRUE; diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/SteppingTests.cs b/src/mono/wasm/debugger/DebuggerTestSuite/SteppingTests.cs index 16cfe82..e517b6d 100644 --- a/src/mono/wasm/debugger/DebuggerTestSuite/SteppingTests.cs +++ b/src/mono/wasm/debugger/DebuggerTestSuite/SteppingTests.cs @@ -903,8 +903,7 @@ namespace DebuggerTests }); } - // [Fact] - // [ActiveIssue("https://github.com/dotnet/runtime/issues/42424")] + [Fact] public async Task BreakOnAwaitThenStepOverToNextAwaitCall() { var insp = new Inspector(); @@ -927,8 +926,7 @@ namespace DebuggerTests }); } - // [Fact] - // [ActiveIssue("https://github.com/dotnet/runtime/issues/42424")] + [Fact] public async Task BreakOnAwaitThenStepOverToNextLine() { var insp = new Inspector(); -- 2.7.4