Make sure breakpoints are enabled

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 701 matching lines @@
     if (!target_function.HasCode()) {
       return;
     }
   }
   Code& code = Code::Handle(target_function.unoptimized_code());
   ASSERT(!code.IsNull());
   PcDescriptors& desc = PcDescriptors::Handle(code.pc_descriptors());
   for (int i = 0; i < desc.Length(); i++) {
     CodeBreakpoint* bpt = GetCodeBreakpoint(desc.PC(i));
     if (bpt != NULL) {
-      // There is already a breakpoint for this address. Leave it alone.
+      // There is already a breakpoint for this address. Make sure
+      // it is enabled.
+      bpt->Enable();
       continue;
     }
     PcDescriptors::Kind kind = desc.DescriptorKind(i);
     if ((kind == PcDescriptors::kIcCall) ||
         (kind == PcDescriptors::kFuncCall) ||
         (kind == PcDescriptors::kReturn)) {
       bpt = new CodeBreakpoint(target_function, i);
       RegisterCodeBreakpoint(bpt);
       bpt->Enable();
     }
@@ skipping 129 matching lines @@
     // We found the the pc descriptor within the given token range that
     // has the lowest execution address. This is the first possible
     // breakpoint on the line. We use this instead of the nearest
     // PC descriptor measured in token index distance.
     best_fit_index = lowest_pc_index;
   }
   if (best_fit_index >= 0) {
     CodeBreakpoint* bpt = GetCodeBreakpoint(desc.PC(best_fit_index));
     // We should only ever have one code breakpoint at the same address.
     // If we find an existing breakpoint, it must be an internal one which
-    // is used for stepping.
+    // is used for stepping, or one that was left over from previously
+    // deleting a source breakpoint. Make sure it's enabled.
     if (bpt != NULL) {
       ASSERT(bpt->src_bpt() == NULL);
+      bpt->Enable();
       return bpt;
     }
 
     bpt = new CodeBreakpoint(func, best_fit_index);
     if (verbose) {
       OS::Print("Setting breakpoint in function '%s' (%s:%d) (PC %p)\n",
                 String::Handle(func.name()).ToCString(),
                 String::Handle(bpt->SourceUrl()).ToCString(),
                 bpt->LineNumber(),
                 bpt->pc());
@@ skipping 664 matching lines @@
 }
 
 
 void Debugger::RegisterCodeBreakpoint(CodeBreakpoint* bpt) {
   ASSERT(bpt->next() == NULL);
   bpt->set_next(code_breakpoints_);
   code_breakpoints_ = bpt;
 }
 
 }  // namespace dart