Detect compile errors when setting breakpoint

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 "include/dart_api.h"
 
 #include "vm/code_generator.h"
 #include "vm/code_patcher.h"
@@ skipping 1158 matching lines @@
           if (function.HasOptimizedCode()) {
             function.SwitchToUnoptimizedCode();
           }
         }
       }
     }
   }
 }
 
 
-void Debugger::SetInternalBreakpoints(const Function& target_function) {
+RawError* Debugger::SetInternalBreakpoints(const Function& target_function) {
   if (target_function.is_native()) {
-    // Can't instrument native functions.
-    return;
+    // Can't instrument native functions. Fail silently.
+    return Error::null();
   }
   Isolate* isolate = Isolate::Current();
   if (!target_function.HasCode()) {
-    Compiler::CompileFunction(isolate, target_function);
-    // If there were any errors, ignore them silently and return without
-    // adding breakpoints to target.
-    if (!target_function.HasCode()) {
-      return;
+    const Error& error = Error::Handle(
+        Compiler::CompileFunction(isolate, target_function));
+    if (!error.IsNull()) {
+      return error.raw();
     }
   }
   // Hang on to the code object before deoptimizing, in case deoptimization
   // might cause the GC to run.
   Code& code = Code::Handle(isolate, target_function.unoptimized_code());
   ASSERT(!code.IsNull());
   DeoptimizeWorld();
   ASSERT(!target_function.HasOptimizedCode());
   PcDescriptors& desc = PcDescriptors::Handle(isolate, code.pc_descriptors());
   PcDescriptors::Iterator iter(desc, kSafepointKind);
   while (iter.MoveNext()) {
     if (iter.TokenPos() != Scanner::kNoSourcePos) {
       CodeBreakpoint* bpt = GetCodeBreakpoint(iter.Pc());
       if (bpt != NULL) {
         // There is already a breakpoint for this address. Make sure
         // it is enabled.
         bpt->Enable();
         continue;
       }
       bpt = new CodeBreakpoint(code, iter.TokenPos(),
                                iter.Pc(), iter.Kind());
       RegisterCodeBreakpoint(bpt);
       bpt->Enable();
     }
   }
+  return Error::null();
 }
 
 
 void Debugger::SignalBpResolved(SourceBreakpoint* bpt) {
   if (HasEventHandler()) {
     DebuggerEvent event(isolate_, DebuggerEvent::kBreakpointResolved);
     event.set_breakpoint(bpt);
     InvokeEventHandler(&event);
   }
 }
@@ skipping 639 matching lines @@
         cbpt->Enable();
       } else {
         cbpt->Disable();
       }
     }
     cbpt = cbpt->next();
   }
 }
 
 
-void Debugger::OneTimeBreakAtEntry(const Function& target_function) {
-  SetInternalBreakpoints(target_function);
-  if (target_function.HasImplicitClosureFunction()) {
+RawError* Debugger::OneTimeBreakAtEntry(const Function& target_function) {
+  Error& err = Error::Handle();
+  err = SetInternalBreakpoints(target_function);
+  if (err.IsNull() && target_function.HasImplicitClosureFunction()) {
     const Function& closure_func =
         Function::Handle(target_function.ImplicitClosureFunction());
-    SetInternalBreakpoints(closure_func);
+    err = SetInternalBreakpoints(closure_func);
   }
+  return err.raw();
 }
 
 
 SourceBreakpoint* Debugger::SetBreakpointAtEntry(
       const Function& target_function) {
   ASSERT(!target_function.IsNull());
   const Script& script = Script::Handle(target_function.script());
   return SetBreakpoint(script,
                        target_function.token_pos(),
                        target_function.end_token_pos());
@@ skipping 686 matching lines @@
 }
 
 
 void Debugger::RegisterCodeBreakpoint(CodeBreakpoint* bpt) {
   ASSERT(bpt->next() == NULL);
   bpt->set_next(code_breakpoints_);
   code_breakpoints_ = bpt;
 }
 
 }  // namespace dart