Dart_PropagateError, take 2.

runtime/vm/debugger_api_impl.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 "include/dart_debugger_api.h"
 
 #include "vm/dart_api_impl.h"
 #include "vm/dart_api_state.h"
 #include "vm/debugger.h"
 #include "vm/isolate.h"
-#include "vm/longjump.h"
 #include "vm/object_store.h"
 
 namespace dart {
 
 #define UNWRAP_AND_CHECK_PARAM(type, var, param)                              \
   do {                                                                        \
     const Object& tmp = Object::Handle(Api::UnwrapHandle(param));             \
     if (tmp.IsNull()) {                                                       \
       return Api::NewError("%s expects argument '%s' to be non-null.",        \
                            CURRENT_FUNC, #param);                             \
@@ skipping 112 matching lines @@
   if (!line_number.IsSmi()) {
     return Api::NewError("%s: line number out of range", CURRENT_FUNC);
   }
   intptr_t line = line_number.AsInt64Value();
 
   const char* msg = CheckIsolateState(isolate);
   if (msg != NULL) {
     return Api::NewError(msg);
   }
 
-  LongJump* base = isolate->long_jump_base();
-  LongJump jump;
-  isolate->set_long_jump_base(&jump);
   Dart_Handle result = Api::True();
   *breakpoint = NULL;
   Debugger* debugger = isolate->debugger();
   ASSERT(debugger != NULL);
-  if (setjmp(*jump.Set()) == 0) {
-    Breakpoint* bpt = debugger->SetBreakpointAtLine(script_url, line);
-    if (bpt == NULL) {
+  Error& error = Error::Handle();
+  Breakpoint* bpt = debugger->SetBreakpointAtLine(script_url, line, &error);
+  if (bpt == NULL) {
+    if (!error.IsNull()) {
+      // If SetBreakpointAtLine provided an error message, use it.
+      result =  Api::NewLocalHandle(error);
+    } else {
       result = Api::NewError("%s: could not set breakpoint at line %d of '%s'",
                              CURRENT_FUNC, line, script_url.ToCString());
-    } else {
-      *breakpoint = reinterpret_cast<Dart_Breakpoint>(bpt);
     }
   } else {
-    SetupErrorResult(&result);
+    *breakpoint = reinterpret_cast<Dart_Breakpoint>(bpt);
   }
-  isolate->set_long_jump_base(base);
   return result;
 }
 
 
 DART_EXPORT Dart_Handle Dart_SetBreakpointAtEntry(
                             Dart_Handle library_in,
                             Dart_Handle class_name_in,
                             Dart_Handle function_name_in,
                             Dart_Breakpoint* breakpoint) {
   Isolate* isolate = Isolate::Current();
@@ skipping 18 matching lines @@
       debugger->ResolveFunction(library, class_name, function_name));
   if (bp_target.IsNull()) {
     const bool toplevel = class_name.Length() == 0;
     return Api::NewError("%s: could not find function '%s%s%s'",
                          CURRENT_FUNC,
                          toplevel ? "" : class_name.ToCString(),
                          toplevel ? "" : ".",
                          function_name.ToCString());
   }
 
-  LongJump* base = isolate->long_jump_base();
-  LongJump jump;
-  isolate->set_long_jump_base(&jump);
   Dart_Handle result = Api::True();
   *breakpoint = NULL;
-  if (setjmp(*jump.Set()) == 0) {
-    Breakpoint* bpt = debugger->SetBreakpointAtEntry(bp_target);
-    if (bpt == NULL) {
-      const char* target_name = Debugger::QualifiedFunctionName(bp_target);
-      result = Api::NewError("%s: no breakpoint location found in '%s'",
+
+  Error& error = Error::Handle();
+  Breakpoint* bpt = debugger->SetBreakpointAtEntry(bp_target, &error);
+  if (!error.IsNull()) {
+    return Api::NewLocalHandle(error);
+  }
+  if (bpt == NULL) {
+    const char* target_name = Debugger::QualifiedFunctionName(bp_target);
+    result = Api::NewError("%s: no breakpoint location found in '%s'",
                              CURRENT_FUNC, target_name);
-    } else {
-      *breakpoint = reinterpret_cast<Dart_Breakpoint>(bpt);
-    }
   } else {
-    SetupErrorResult(&result);
+    *breakpoint = reinterpret_cast<Dart_Breakpoint>(bpt);
   }
-  isolate->set_long_jump_base(base);
   return result;
 }
 
 
 DART_EXPORT Dart_Handle Dart_DeleteBreakpoint(
                             Dart_Breakpoint breakpoint_in) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
 
   CHECK_AND_CAST(Breakpoint, breakpoint, breakpoint_in);
@@ skipping 119 matching lines @@
   for (int i = 0; i < num_libs; i++) {
     ASSERT(!lib.IsNull());
     lib_url = lib.url();
     library_list.SetAt(i, lib_url);
     lib = lib.next_registered();
   }
   return Api::NewLocalHandle(library_list);
 }
 
 }  // namespace dart