Dart_PropagateError, take 2.

runtime/vm/debugger.cc

 // Copyright (c) 2011, 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_index_table.h"
 #include "vm/code_patcher.h"
 #include "vm/compiler.h"
 #include "vm/dart_entry.h"
 #include "vm/flags.h"
 #include "vm/globals.h"
 #include "vm/longjump.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/os.h"
 #include "vm/stack_frame.h"
 #include "vm/stub_code.h"
 #include "vm/visitor.h"
 
 
 namespace dart {
 
 static const bool verbose = false;
 
+
 Breakpoint::Breakpoint(const Function& func, intptr_t pc_desc_index)
     : function_(func.raw()),
       pc_desc_index_(pc_desc_index),
       pc_(0),
       saved_bytes_(0),
       line_number_(-1),
       next_(NULL) {
   Code& code = Code::Handle(func.code());
   ASSERT(!code.IsNull());  // Function must be compiled.
   PcDescriptors& desc = PcDescriptors::Handle(code.pc_descriptors());
@@ skipping 304 matching lines @@
       function = cls.LookupDynamicFunction(function_name);
     }
   }
   return function.raw();
 }
 
 
 // TODO(hausner): Distinguish between newly created breakpoints and
 // returning a breakpoint that already exists?
 Breakpoint* Debugger::SetBreakpoint(const Function& target_function,
-                                    intptr_t token_index) {
+                                    intptr_t token_index,
+                                    Error* error) {
   if ((token_index < target_function.token_index()) ||
       (target_function.end_token_index() <= token_index)) {
     // The given token position is not within the target function.
     return NULL;
   }
   if (!target_function.HasCode()) {
-    Compiler::CompileFunction(target_function);
+    *error = Compiler::CompileFunction(target_function);
+    if (!error->IsNull()) {
+      return NULL;
+    }
   }
   Code& code = Code::Handle(target_function.code());
   ASSERT(!code.IsNull());
   PcDescriptors& desc = PcDescriptors::Handle(code.pc_descriptors());
   for (int i = 0; i < desc.Length(); i++) {
     if (desc.TokenIndex(i) < token_index) {
       continue;
     }
     PcDescriptors::Kind kind = desc.DescriptorKind(i);
     Breakpoint* bpt = NULL;
@@ skipping 49 matching lines @@
   ASSERT(bpt->pc() == desc.PC(desc_index));
   PcDescriptors::Kind kind = desc.DescriptorKind(desc_index);
   if (kind == PcDescriptors::kIcCall) {
     CodePatcher::PatchInstanceCallAt(desc.PC(desc_index), bpt->saved_bytes_);
   } else {
     CodePatcher::PatchStaticCallAt(desc.PC(desc_index), bpt->saved_bytes_);
   }
 }
 
 
-Breakpoint* Debugger::SetBreakpointAtEntry(const Function& target_function) {
+Breakpoint* Debugger::SetBreakpointAtEntry(const Function& target_function,
+                                           Error* error) {
   ASSERT(!target_function.IsNull());
-  return SetBreakpoint(target_function, target_function.token_index());
+  return SetBreakpoint(target_function, target_function.token_index(), error);
 }
 
 
 Breakpoint* Debugger::SetBreakpointAtLine(const String& script_url,
-                                          intptr_t line_number) {
+                                          intptr_t line_number,
+                                          Error* error) {
   Library& lib = Library::Handle();
   Script& script = Script::Handle();
   lib = isolate_->object_store()->registered_libraries();
   while (!lib.IsNull()) {
     script = lib.LookupScript(script_url);
     if (!script.IsNull()) {
       break;
     }
     lib = lib.next_registered();
   }
   if (script.IsNull()) {
     return NULL;
   }
   intptr_t token_index_at_line = script.TokenIndexAtLine(line_number);
   if (token_index_at_line < 0) {
     // Script does not contain the given line number.
     return NULL;
   }
   const Function& func =
       Function::Handle(lib.LookupFunctionInScript(script, token_index_at_line));
   if (func.IsNull()) {
     return NULL;
   }
-  return SetBreakpoint(func, token_index_at_line);
+  return SetBreakpoint(func, token_index_at_line, error);
 }
 
 
 static RawArray* MakeNameValueList(const GrowableArray<Object*>& pairs) {
   int pairs_len = pairs.length();
   ASSERT(pairs_len % 2 == 0);
   const Array& list = Array::Handle(Array::New(pairs_len));
   for (int i = 0; i < pairs_len; i++) {
     list.SetAt(i, *pairs[i]);
   }
@@ skipping 214 matching lines @@
 
 
 void Debugger::RegisterBreakpoint(Breakpoint* bpt) {
   ASSERT(bpt->next() == NULL);
   bpt->set_next(this->breakpoints_);
   this->breakpoints_ = bpt;
 }
 
 
 }  // namespace dart