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

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: 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/dart.cc ('k') | runtime/vm/object.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/debugger.cc
diff --git a/runtime/vm/debugger.cc b/runtime/vm/debugger.cc
index 939dafdd8fdfab7866e6af741d3633fe4051c6e6..e2a02f116aca1b3e624bd095aa5d941f628bf644 100644
--- a/runtime/vm/debugger.cc
+++ b/runtime/vm/debugger.cc
@@ -1215,7 +1215,8 @@ void Debugger::Shutdown() {
delete bpt;
}
// Signal isolate shutdown event.
- if (!ServiceIsolate::IsServiceIsolateDescendant(isolate_)) {
+ if (!ServiceIsolate::IsServiceIsolateDescendant(isolate_) &&
+ (isolate_ != Dart::vm_isolate())) {
Cutch 2015/06/09 14:57:33 I think the real bug is that the vm-isolate should
zra 2015/06/09 15:45:17 Ah, yah. That makes sense. I'll see if I can get r
zra 2015/06/09 17:29:01 Done. Removed debugger from vm isolate, and added
SignalIsolateEvent(DebuggerEvent::kIsolateShutdown);
}
}
« no previous file with comments | « runtime/vm/dart.cc ('k') | runtime/vm/object.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698