Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(837)

Unified Diff: runtime/vm/debugger_api_impl.cc

Issue 9169102: Add Dart_PropagateError. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Removed some unneeded includes Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: runtime/vm/debugger_api_impl.cc
===================================================================
--- runtime/vm/debugger_api_impl.cc (revision 3415)
+++ runtime/vm/debugger_api_impl.cc (working copy)
@@ -8,7 +8,6 @@
#include "vm/dart_api_state.h"
#include "vm/debugger.h"
#include "vm/isolate.h"
-#include "vm/longjump.h"
namespace dart {
@@ -141,24 +140,21 @@
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;
}

Powered by Google App Engine
This is Rietveld 408576698