[wasm][debugger] Reverting the old behavior of scope id numeration (#…

…59368) * Keeping the old behavior of scope id what we have before start using debugger-agent. * Fix compilation. * Fix compilation.
dotnet · Sep 21, 2021 · f697235 · f697235
1 parent b72cd48
commit f697235
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 2 deletions.
diff --git a/src/mono/mono/component/debugger-agent.c b/src/mono/mono/component/debugger-agent.c
@@ -355,7 +355,9 @@ static int objref_id = 0;
 
 static int event_request_id = 0;
 
+#ifndef TARGET_WASM
 static int frame_id = 0;
+#endif
 
 static GPtrArray *event_requests;
 
@@ -3024,7 +3026,7 @@ compute_frame_info (MonoInternalThread *thread, DebuggerTlsData *tls, gboolean f
 {
  ComputeFramesUserData user_data;
  GSList *tmp;
- int i, findex, new_frame_count;
+ int findex, new_frame_count;
  StackFrame **new_frames, *f;
  MonoUnwindOptions opts = (MonoUnwindOptions)(MONO_UNWIND_DEFAULT | MONO_UNWIND_REG_LOCATIONS);
 
@@ -3083,6 +3085,8 @@ compute_frame_info (MonoInternalThread *thread, DebuggerTlsData *tls, gboolean f
  for (tmp = user_data.frames; tmp; tmp = tmp->next) {
  f = (StackFrame *)tmp->data;
 
+#ifndef TARGET_WASM
+ int i;
  /* 
  * Reuse the id for already existing stack frames, so invokes don't invalidate
  * the still valid stack frames.
@@ -3096,7 +3100,9 @@ compute_frame_info (MonoInternalThread *thread, DebuggerTlsData *tls, gboolean f
 
  if (i >= tls->frame_count)
  f->id = mono_atomic_inc_i32 (&frame_id);
-
+#else //keep the same behavior that we have for wasm before start using debugger-agent 
+ f->id = findex+1;
+#endif
  new_frames [findex ++] = f;
  }
 

diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/SteppingTests.cs b/src/mono/wasm/debugger/DebuggerTestSuite/SteppingTests.cs
@@ -928,5 +928,25 @@ await EvaluateAndCheck(
  await StepAndCheck(StepKind.Over, "dotnet://debugger-test.dll/debugger-test.cs", 719, 8, "MoveNext");
  await StepAndCheck(StepKind.Over, "dotnet://debugger-test.dll/debugger-test.cs", 720, 4, "MoveNext");
  }
+
+ [Fact]
+ public async Task CheckResetFrameNumberForEachStep()
+ {
+ var bp_conditional = await SetBreakpointInMethod("debugger-test.dll", "SteppingInto", "MethodToStep", 1);
+ await EvaluateAndCheck(
+ "window.setTimeout(function() { invoke_static_method('[debugger-test] SteppingInto:MethodToStep'); }, 1);",
+ "dotnet://debugger-test.dll/debugger-test.cs",
+ bp_conditional.Value["locations"][0]["lineNumber"].Value<int>(),
+ bp_conditional.Value["locations"][0]["columnNumber"].Value<int>(),
+ "MethodToStep"
+ );
+ var pause_location = await StepAndCheck(StepKind.Into, "dotnet://debugger-test.dll/debugger-test.cs", 799, 4, "Increment");
+ pause_location = await StepAndCheck(StepKind.Over, "dotnet://debugger-test.dll/debugger-test.cs", 800, 8, "Increment");
+ Assert.Equal(pause_location["callFrames"][0]["callFrameId"], "dotnet:scope:1");
+ pause_location = await StepAndCheck(StepKind.Over, "dotnet://debugger-test.dll/debugger-test.cs", 801, 8, "Increment");
+ Assert.Equal(pause_location["callFrames"][0]["callFrameId"], "dotnet:scope:1");
+ pause_location = await StepAndCheck(StepKind.Over, "dotnet://debugger-test.dll/debugger-test.cs", 806, 8, "Increment");
+ Assert.Equal(pause_location["callFrames"][0]["callFrameId"], "dotnet:scope:1");
+ }
  }
 }
diff --git a/src/mono/wasm/debugger/tests/debugger-test/debugger-test.cs b/src/mono/wasm/debugger/tests/debugger-test/debugger-test.cs
@@ -782,3 +782,28 @@ public static void LoopToBreak()
  }
 }
 
+public class SteppingInto
+{
+ static int currentCount = 0;
+ static MyIncrementer incrementer = new MyIncrementer();
+ public static void MethodToStep()
+ {
+ currentCount = incrementer.Increment(currentCount);
+ }
+}
+
+public class MyIncrementer
+{
+ private Func<DateTime> todayFunc = () => DateTime.Now;
+
+ public int Increment(int count)
+ {
+ var today = todayFunc();
+ if (today.DayOfWeek == DayOfWeek.Sunday)
+ {
+ return count + 2;
+ }
+
+ return count + 1;
+ }
+}