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

Unified Diff: runtime/vm/debugger.cc

Issue 1168933002: Fixes crashes in VM isolate shutdown. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Add asserts 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
Index: runtime/vm/debugger.cc
diff --git a/runtime/vm/debugger.cc b/runtime/vm/debugger.cc
index 939dafdd8fdfab7866e6af741d3633fe4051c6e6..80c12cea7f5023b99756ce3a29c26dafb4a915af 100644
--- a/runtime/vm/debugger.cc
+++ b/runtime/vm/debugger.cc
@@ -316,6 +316,7 @@ void Debugger::SignalIsolateEvent(DebuggerEvent::EventType type) {
void Debugger::SignalIsolateInterrupted() {
if (HasEventHandler()) {
+ ASSERT(Isolate::Current()->debugger() != NULL);
Debugger* debugger = Isolate::Current()->debugger();
ASSERT(debugger != NULL);
debugger->SignalIsolateEvent(DebuggerEvent::kIsolateInterrupted);
@@ -844,6 +845,7 @@ void ActivationFrame::PrintContextMismatchError(
OS::PrintErr("-------------------------\n"
"Debugger stack trace...\n\n");
+ ASSERT(Isolate::Current()->debugger() != NULL);
DebuggerStackTrace* stack =
Isolate::Current()->debugger()->StackTrace();
intptr_t num_frames = stack->Length();

Powered by Google App Engine
This is Rietveld 408576698