Resubmitting r18013.

runtime/vm/debugger_api_impl.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 "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"
@@ skipping 247 matching lines @@
   DARTSCOPE(isolate);
   UNWRAP_AND_CHECK_PARAM(String, script_url, script_url_in);
   UNWRAP_AND_CHECK_PARAM(Integer, line_number, line_number_in);
   CHECK_NOT_NULL(breakpoint);
 
   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("%s", msg);
+  Dart_Handle state = Api::CheckIsolateState(isolate);
+  if (::Dart_IsError(state)) {
+    return state;
   }
 
   Dart_Handle result = Api::True(isolate);
   *breakpoint = NULL;
   Debugger* debugger = isolate->debugger();
   ASSERT(debugger != NULL);
   SourceBreakpoint* bpt =
       debugger->SetBreakpointAtLine(script_url, line);
   if (bpt == NULL) {
     result = Api::NewError("%s: could not set breakpoint at line %"Pd" of '%s'",
@@ skipping 40 matching lines @@
                             Dart_Handle class_name_in,
                             Dart_Handle function_name_in,
                             Dart_Breakpoint* breakpoint) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   UNWRAP_AND_CHECK_PARAM(Library, library, library_in);
   UNWRAP_AND_CHECK_PARAM(String, class_name, class_name_in);
   UNWRAP_AND_CHECK_PARAM(String, function_name, function_name_in);
   CHECK_NOT_NULL(breakpoint);
 
-  const char* msg = CheckIsolateState(isolate);
-  if (msg != NULL) {
-    return Api::NewError("%s", msg);
+  Dart_Handle state = Api::CheckIsolateState(isolate);
+  if (::Dart_IsError(state)) {
+    return state;
   }
 
   // Resolve the breakpoint target function.
   Debugger* debugger = isolate->debugger();
   const Function& bp_target = Function::Handle(
       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,
@@ skipping 20 matching lines @@
 DART_EXPORT Dart_Handle Dart_OneTimeBreakAtEntry(
                             Dart_Handle library_in,
                             Dart_Handle class_name_in,
                             Dart_Handle function_name_in) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   UNWRAP_AND_CHECK_PARAM(Library, library, library_in);
   UNWRAP_AND_CHECK_PARAM(String, class_name, class_name_in);
   UNWRAP_AND_CHECK_PARAM(String, function_name, function_name_in);
 
-  const char* msg = CheckIsolateState(isolate);
-  if (msg != NULL) {
-    return Api::NewError("%s", msg);
+  Dart_Handle state = Api::CheckIsolateState(isolate);
+  if (::Dart_IsError(state)) {
+    return state;
   }
 
   // Resolve the breakpoint target function.
   Debugger* debugger = isolate->debugger();
   const Function& bp_target = Function::Handle(
       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,
@@ skipping 358 matching lines @@
   return Api::True(isolate);
 }
 
 
 DART_EXPORT Dart_Isolate Dart_GetIsolate(Dart_IsolateId isolate_id) {
   Isolate* isolate = PortMap::GetIsolate(isolate_id);
   return Api::CastIsolate(isolate);
 }
 
 }  // namespace dart