[vm/bytecode] Debugger should not signal breakpoint resolution twice.

crelier · commit-bot@chromium.org · commit dda69953e273 · 2019-08-29T00:51:35.000Z
If the debugger has already signaled the resolution of a breakpoint in a bytecode function, it should not signal its resolution in code again. This fixes test service/breakpoint_async_break_test Change-Id: I88743b65eb3049a1a9476cb67f17ebf4275f8455 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/114923 Reviewed-by: Ryan Macnak <rmacnak@google.com> Commit-Queue: Régis Crelier <regis@google.com>
diff --git a/runtime/vm/debugger.cc b/runtime/vm/debugger.cc
@@ -4748,6 +4748,8 @@ void Debugger::HandleCodeChange(bool bytecode_loaded, const Function& func) {
       // There is no local function within func that contains the
       // breakpoint token position. Resolve the breakpoint if necessary
       // and set the code breakpoints.
+      const bool resolved_in_bytecode =
+          !bytecode_loaded && loc->IsResolved(/* in_bytecode = */ true);
       if (!loc->IsResolved(bytecode_loaded)) {
         // Resolve source breakpoint in the newly compiled function.
         TokenPosition bp_pos = ResolveBreakpointPos(
@@ -4774,7 +4776,11 @@ void Debugger::HandleCodeChange(bool bytecode_loaded, const Function& func) {
                 func.ToFullyQualifiedCString(), requested_pos.ToCString(),
                 requested_end_pos.ToCString(), loc->requested_column_number());
           }
-          SendBreakpointEvent(ServiceEvent::kBreakpointResolved, bpt);
+          // Do not signal resolution in code if already signaled resolution
+          // in bytecode.
+          if (!resolved_in_bytecode) {
+            SendBreakpointEvent(ServiceEvent::kBreakpointResolved, bpt);
+          }
           bpt = bpt->next();
         }
       }
