Fix for issue 19817

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/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_api_state.h"
@@ skipping 296 matching lines @@
   }
   return Api::Success();
 }
 
 
 DART_EXPORT Dart_Handle Dart_GetFunctionOrigin(Dart_Handle function_in) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   UNWRAP_AND_CHECK_PARAM(Function, function, function_in);
 
-  Dart_Handle state = Api::CheckIsolateState(isolate);
-  if (::Dart_IsError(state)) {
-    return state;
-  }
-
   const Class& cls = Class::Handle(function.origin());
   if (!cls.IsTopLevel()) {
     return Dart_NewInteger(cls.id());
   }
   return Api::Null();
 }
 
 
 DART_EXPORT Dart_Handle Dart_GetLocalVariables(
                             Dart_ActivationFrame activation_frame) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   CHECK_AND_CAST(ActivationFrame, frame, activation_frame);
   return Api::NewHandle(isolate, frame->GetLocalVariables());
 }
 
 
 DART_EXPORT Dart_Handle Dart_SetBreakpoint(
                             Dart_Handle script_url_in,
                             intptr_t line_number) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   UNWRAP_AND_CHECK_PARAM(String, script_url, script_url_in);
 
-  Dart_Handle state = Api::CheckIsolateState(isolate);
-  if (::Dart_IsError(state)) {
-    return state;
-  }
-
   Debugger* debugger = isolate->debugger();
   ASSERT(debugger != NULL);
   SourceBreakpoint* bpt =
       debugger->SetBreakpointAtLine(script_url, line_number);
   if (bpt == NULL) {
     return Api::NewError("%s: could not set breakpoint at line %" Pd " in '%s'",
                          CURRENT_FUNC, line_number, script_url.ToCString());
   }
   return Dart_NewInteger(bpt->id());
 }
@@ skipping 32 matching lines @@
 DART_EXPORT Dart_Handle Dart_SetBreakpointAtEntry(
                             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);
 
-  Dart_Handle state = Api::CheckIsolateState(isolate);

[hausner, 2014/07/22 18:23:32]

Should we check that the library has been successfully loaded? If so, just add a
TODO and I'll add the check later.

[siva, 2014/07/22 19:55:11]

Added a check that the library passed in is loaded.

On 2014/07/22 18:23:32, hausner wrote:

-  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,
                          toplevel ? "" : class_name.ToCString(),
                          toplevel ? "" : ".",
@@ skipping 13 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);
 
-  Dart_Handle state = Api::CheckIsolateState(isolate);

[hausner, 2014/07/22 18:23:32]

ditto

[siva, 2014/07/22 19:55:11]

Done.

-  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,
                          toplevel ? "" : class_name.ToCString(),
                          toplevel ? "" : ".",
@@ skipping 525 matching lines @@
   return Api::CastIsolate(isolate);
 }
 
 
 DART_EXPORT Dart_IsolateId Dart_GetIsolateId(Dart_Isolate dart_isolate) {
   Isolate* isolate = reinterpret_cast<Isolate*>(dart_isolate);
   return isolate->debugger()->GetIsolateId();
 }
 
 }  // namespace dart