Fixes crashes in VM isolate shutdown.

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 35 matching lines @@
 #define CHECK_NOT_NULL(param)                                                  \
   if (param == NULL) {                                                         \
     return Api::NewError("%s expects argument '%s' to be non-null.",           \
                          CURRENT_FUNC, #param);                                \
   }
 
 
 DART_EXPORT intptr_t Dart_CacheObject(Dart_Handle object_in) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
+  ASSERT(isolate->debugger() != NULL);
   const Object& obj = Object::Handle(Api::UnwrapHandle(object_in));
   if (obj.IsApiError()) {
     return -1;
   }
   return isolate->debugger()->CacheObject(obj);
 }
 
 
 DART_EXPORT Dart_Handle Dart_GetCachedObject(intptr_t obj_id) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
+  ASSERT(isolate->debugger() != NULL);
   if (!isolate->debugger()->IsValidObjectId(obj_id)) {
     return Api::NewError("%s: object id %" Pd " is invalid",
                          CURRENT_FUNC, obj_id);
   }
   return Api::NewHandle(isolate, isolate->debugger()->GetCachedObject(obj_id));
 }
 
 
 DART_EXPORT Dart_Handle Dart_StackTraceLength(
                             Dart_StackTrace trace,
@@ skipping 115 matching lines @@
 DART_EXPORT void Dart_SetIsolateEventHandler(Dart_IsolateEventHandler handler) {
   isolate_event_handler = handler;
   Debugger::SetEventHandler(DebuggerEventHandler);
 }
 
 
 DART_EXPORT Dart_Handle Dart_SetExceptionPauseInfo(
                             Dart_ExceptionPauseInfo pause_info) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
+  ASSERT(isolate->debugger() != NULL);
   isolate->debugger()->SetExceptionPauseInfo(pause_info);
   return Api::Success();
 }
 
 
 DART_EXPORT Dart_ExceptionPauseInfo Dart_GetExceptionPauseInfo() {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
+  ASSERT(isolate->debugger() != NULL);
   return isolate->debugger()->GetExceptionPauseInfo();
 }
 
 
 DART_EXPORT Dart_Handle Dart_GetStackTrace(Dart_StackTrace* trace) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   CHECK_NOT_NULL(trace);
+  ASSERT(isolate->debugger() != NULL);
   *trace = reinterpret_cast<Dart_StackTrace>(
       isolate->debugger()->CurrentStackTrace());
   return Api::Success();
 }
 
 
 DART_EXPORT Dart_Handle Dart_GetStackTraceFromError(Dart_Handle handle,
                                                     Dart_StackTrace* trace) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   CHECK_NOT_NULL(trace);
+  ASSERT(isolate->debugger() != NULL);
   const Object& obj = Object::Handle(isolate, Api::UnwrapHandle(handle));
   if (obj.IsUnhandledException()) {
     const UnhandledException& error = UnhandledException::Cast(obj);
     Stacktrace& dart_stacktrace = Stacktrace::Handle(isolate);
     dart_stacktrace ^= error.stacktrace();
     if (dart_stacktrace.IsNull()) {
       *trace = NULL;
     } else {
       *trace = reinterpret_cast<Dart_StackTrace>(
         isolate->debugger()->StackTraceFrom(dart_stacktrace));
@@ skipping 91 matching lines @@
   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);
+  ASSERT(isolate->debugger() != NULL);
   UNWRAP_AND_CHECK_PARAM(String, script_url, script_url_in);
 
   Debugger* debugger = isolate->debugger();
   ASSERT(debugger != NULL);
   Breakpoint* 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());
 }
 
 
 DART_EXPORT Dart_Handle Dart_GetBreakpointURL(intptr_t bp_id) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
+  ASSERT(isolate->debugger() != NULL);
   Debugger* debugger = isolate->debugger();
   ASSERT(debugger != NULL);

[Ivan Posva, 2015/06/16 16:31:15]

Where is the difference to this line?

ditto at other places...

 
   Breakpoint* bpt = debugger->GetBreakpointById(bp_id);
   if (bpt == NULL) {
     return Api::NewError("%s: breakpoint with id %" Pd " does not exist",
                            CURRENT_FUNC, bp_id);
   }
   return Api::NewHandle(isolate, bpt->bpt_location()->url());
 }
 
 
 DART_EXPORT Dart_Handle Dart_GetBreakpointLine(intptr_t bp_id) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
+  ASSERT(isolate->debugger() != NULL);
   Debugger* debugger = isolate->debugger();
   ASSERT(debugger != NULL);
 
   Breakpoint* bpt = debugger->GetBreakpointById(bp_id);
   if (bpt == NULL) {
     return Api::NewError("%s: breakpoint with id %" Pd " does not exist",
                          CURRENT_FUNC, bp_id);
   }
   return Dart_NewInteger(bpt->bpt_location()->LineNumber());
 }
 
 
 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);
+  ASSERT(isolate->debugger() != NULL);
   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);
 
   // Ensure that the library is loaded.
   if (!library.Loaded()) {
     return Api::NewError(
         "%s expects library argument 'library_in' to be loaded.",
         CURRENT_FUNC);
   }
@@ skipping 20 matching lines @@
   return Dart_NewInteger(bpt->id());
 }
 
 
 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);
+  ASSERT(isolate->debugger() != NULL);
   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);
 
   // Ensure that the library is loaded.
   if (!library.Loaded()) {
     return Api::NewError(
         "%s expects library argument 'library_in' to be loaded.",
         CURRENT_FUNC);
   }
@@ skipping 16 matching lines @@
   if (!error.IsNull()) {
     return Api::NewHandle(isolate, error.raw());
   }
   return Api::Success();
 }
 
 
 DART_EXPORT Dart_Handle Dart_RemoveBreakpoint(intptr_t bp_id) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
-  Debugger* debugger = isolate->debugger();
-  ASSERT(debugger != NULL);
-
+  ASSERT(isolate->debugger() != NULL);
   isolate->debugger()->RemoveBreakpoint(bp_id);
   return Api::Success();
 }
 
 
 DART_EXPORT Dart_Handle Dart_SetStepOver() {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
+  ASSERT(isolate->debugger() != NULL);
   isolate->debugger()->SetStepOver();
   return Api::Success();
 }
 
 
 DART_EXPORT Dart_Handle Dart_SetStepInto() {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
+  ASSERT(isolate->debugger() != NULL);
   isolate->debugger()->SetSingleStep();
   return Api::Success();
 }
 
 
 DART_EXPORT Dart_Handle Dart_SetStepOut() {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
+  ASSERT(isolate->debugger() != NULL);
   isolate->debugger()->SetStepOut();
   return Api::Success();
 }
 
 
 DART_EXPORT Dart_Handle Dart_GetInstanceFields(Dart_Handle object_in) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
+  ASSERT(isolate->debugger() != NULL);
   UNWRAP_AND_CHECK_PARAM(Instance, obj, object_in);
   return Api::NewHandle(isolate, isolate->debugger()->GetInstanceFields(obj));
 }
 
 
 DART_EXPORT Dart_Handle Dart_GetStaticFields(Dart_Handle target) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
+  ASSERT(isolate->debugger() != NULL);
   const Type& type_obj = Api::UnwrapTypeHandle(isolate, target);
   if (type_obj.IsNull()) {
     return Api::NewError("%s expects argument 'target' to be a type",
                          CURRENT_FUNC);
   }
   const Class& cls = Class::Handle(isolate, type_obj.type_class());
   return Api::NewHandle(isolate, isolate->debugger()->GetStaticFields(cls));
 }
 
 
 DART_EXPORT Dart_Handle Dart_GetLibraryFields(intptr_t library_id) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
+  ASSERT(isolate->debugger() != NULL);
   const Library& lib =
       Library::Handle(isolate, Library::GetLibrary(library_id));
   if (lib.IsNull()) {
     return Api::NewError("%s: %" Pd " is not a valid library id",
                          CURRENT_FUNC, library_id);
   }
   return Api::NewHandle(isolate, isolate->debugger()->GetLibraryFields(lib));
 }
 
 
 DART_EXPORT Dart_Handle Dart_GetGlobalVariables(intptr_t library_id) {
   Isolate* isolate = Isolate::Current();
   ASSERT(isolate != NULL);
   DARTSCOPE(isolate);
+  ASSERT(isolate->debugger() != NULL);
   const Library& lib = Library::Handle(Library::GetLibrary(library_id));
   if (lib.IsNull()) {
     return Api::NewError("%s: %" Pd " is not a valid library id",
                          CURRENT_FUNC, library_id);
   }
   return Api::NewHandle(isolate, isolate->debugger()->GetGlobalFields(lib));
 }
 
 
 DART_EXPORT Dart_Handle Dart_ActivationFrameEvaluate(
@@ skipping 167 matching lines @@
 
 
 DART_EXPORT Dart_Handle Dart_GetClassInfo(
                             intptr_t cls_id,
                             Dart_Handle* class_name,
                             intptr_t* library_id,
                             intptr_t* super_class_id,
                             Dart_Handle* static_fields) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
+  ASSERT(isolate->debugger() != NULL);
   if (!isolate->class_table()->IsValidIndex(cls_id)) {
     return Api::NewError("%s: %" Pd " is not a valid class id",
                          CURRENT_FUNC, cls_id);
   }
   Class& cls = Class::Handle(isolate, isolate->class_table()->At(cls_id));
   if (class_name != NULL) {
     *class_name = Api::NewHandle(isolate, cls.Name());
   }
   if (library_id != NULL) {
     const Library& lib = Library::Handle(isolate, cls.library());
@@ skipping 243 matching lines @@
 
 
 DART_EXPORT Dart_Isolate Dart_GetIsolate(Dart_IsolateId isolate_id) {
   Isolate* isolate = PortMap::GetIsolate(isolate_id);
   return Api::CastIsolate(isolate);
 }
 
 
 DART_EXPORT Dart_IsolateId Dart_GetIsolateId(Dart_Isolate dart_isolate) {
   Isolate* isolate = reinterpret_cast<Isolate*>(dart_isolate);
+  ASSERT(isolate->debugger() != NULL);
   return isolate->debugger()->GetIsolateId();
 }
 
 }  // namespace dart