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

Unified Diff: runtime/vm/debugger_api_impl.cc

Issue 1168933002: Fixes crashes in VM isolate shutdown. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 6 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
« no previous file with comments | « runtime/vm/debugger.cc ('k') | runtime/vm/isolate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/debugger_api_impl.cc
diff --git a/runtime/vm/debugger_api_impl.cc b/runtime/vm/debugger_api_impl.cc
index fc6a5ea759e833bcf5933011fe28e3c9d91cb2c4..480f18cd4e9e8135b23cd491a922ce2046dc2d44 100644
--- a/runtime/vm/debugger_api_impl.cc
+++ b/runtime/vm/debugger_api_impl.cc
@@ -110,7 +110,6 @@ static Dart_IsolateEventHandler* isolate_event_handler = NULL;
static void DebuggerEventHandler(DebuggerEvent* event) {
Isolate* isolate = Isolate::Current();
ASSERT(isolate != NULL);
- ASSERT(isolate->debugger() != NULL);
Dart_EnterScope();
Dart_IsolateId isolate_id = isolate->debugger()->GetIsolateId();
if (event->type() == DebuggerEvent::kBreakpointReached) {
@@ -340,7 +339,6 @@ DART_EXPORT Dart_Handle Dart_SetBreakpoint(
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) {
@@ -355,7 +353,6 @@ DART_EXPORT Dart_Handle Dart_GetBreakpointURL(intptr_t bp_id) {
Isolate* isolate = Isolate::Current();
DARTSCOPE(isolate);
Debugger* debugger = isolate->debugger();
- ASSERT(debugger != NULL);
Breakpoint* bpt = debugger->GetBreakpointById(bp_id);
if (bpt == NULL) {
@@ -370,7 +367,6 @@ DART_EXPORT Dart_Handle Dart_GetBreakpointLine(intptr_t bp_id) {
Isolate* isolate = Isolate::Current();
DARTSCOPE(isolate);
Debugger* debugger = isolate->debugger();
- ASSERT(debugger != NULL);
Breakpoint* bpt = debugger->GetBreakpointById(bp_id);
if (bpt == NULL) {
@@ -463,9 +459,6 @@ DART_EXPORT Dart_Handle Dart_OneTimeBreakAtEntry(
DART_EXPORT Dart_Handle Dart_RemoveBreakpoint(intptr_t bp_id) {
Isolate* isolate = Isolate::Current();
DARTSCOPE(isolate);
- Debugger* debugger = isolate->debugger();
- ASSERT(debugger != NULL);
-
isolate->debugger()->RemoveBreakpoint(bp_id);
return Api::Success();
}
« no previous file with comments | « runtime/vm/debugger.cc ('k') | runtime/vm/isolate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698