Fix Dart_RemoveBreakpoint

runtime/vm/debugger.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/debugger.h"
 
 #include "vm/code_generator.h"
 #include "vm/code_patcher.h"
 #include "vm/compiler.h"
 #include "vm/dart_entry.h"
@@ skipping 1443 matching lines @@
   ASSERT(src_breakpoints_ != NULL);
   SourceBreakpoint* prev_bpt = NULL;
   SourceBreakpoint* curr_bpt = src_breakpoints_;
   while (curr_bpt != NULL) {
     if (curr_bpt->id() == bp_id) {
       if (prev_bpt == NULL) {
         src_breakpoints_ = src_breakpoints_->next();
       } else {
         prev_bpt->set_next(curr_bpt->next());
       }
-      // Remove references from code breakpoints to this source breakpoint.
+      // Remove references from code breakpoints to this source breakpoint,
+      // and disable the code breakpoints.
       UnlinkCodeBreakpoints(curr_bpt);
       delete curr_bpt;
       return;
     }
     prev_bpt = curr_bpt;
     curr_bpt = curr_bpt->next();
   }
   // bpt is not a registered breakpoint, nothing to do.
 }
 
 
 // Turn code breakpoints associated with the given source breakpoint into
 // internal breakpoints. They will later be deleted when control
-// returns from the user-defined breakpoint callback.
-// Breakpoints can only be deleted by the user when we are stopped
-// at another breakpoint, so we are guaranteed to remove the unlinked
-// code breakpoints when returning from the handler.
+// returns from the user-defined breakpoint callback. Also, disable the
+// breakpoint so it no longer fires if it should be hit before it gets
+// deleted.
 void Debugger::UnlinkCodeBreakpoints(SourceBreakpoint* src_bpt) {
   ASSERT(src_bpt != NULL);
   CodeBreakpoint* curr_bpt = code_breakpoints_;
   while (curr_bpt != NULL) {
     if (curr_bpt->src_bpt() == src_bpt) {
+      curr_bpt->Disable();
       curr_bpt->set_src_bpt(NULL);
     }
     curr_bpt = curr_bpt->next();
   }
 }
 
 
 // Remove and delete internal breakpoints, i.e. breakpoints that
 // are not associated with a source breakpoint.
 void Debugger::RemoveInternalBreakpoints() {
@@ skipping 51 matching lines @@
 }
 
 
 void Debugger::RegisterCodeBreakpoint(CodeBreakpoint* bpt) {
   ASSERT(bpt->next() == NULL);
   bpt->set_next(code_breakpoints_);
   code_breakpoints_ = bpt;
 }
 
 }  // namespace dart