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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « runtime/vm/dart.cc ('k') | runtime/vm/object.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 #include "vm/debugger.h" 5 #include "vm/debugger.h"
6 6
7 #include "include/dart_api.h" 7 #include "include/dart_api.h"
8 8
9 #include "vm/code_generator.h" 9 #include "vm/code_generator.h"
10 #include "vm/code_patcher.h" 10 #include "vm/code_patcher.h"
(...skipping 1197 matching lines...) Expand 10 before | Expand all | Expand 10 after
1208 latent_locations_ = latent_locations_->next(); 1208 latent_locations_ = latent_locations_->next();
1209 delete bpt; 1209 delete bpt;
1210 } 1210 }
1211 while (code_breakpoints_ != NULL) { 1211 while (code_breakpoints_ != NULL) {
1212 CodeBreakpoint* bpt = code_breakpoints_; 1212 CodeBreakpoint* bpt = code_breakpoints_;
1213 code_breakpoints_ = code_breakpoints_->next(); 1213 code_breakpoints_ = code_breakpoints_->next();
1214 bpt->Disable(); 1214 bpt->Disable();
1215 delete bpt; 1215 delete bpt;
1216 } 1216 }
1217 // Signal isolate shutdown event. 1217 // Signal isolate shutdown event.
1218 if (!ServiceIsolate::IsServiceIsolateDescendant(isolate_)) { 1218 if (!ServiceIsolate::IsServiceIsolateDescendant(isolate_) &&
1219 (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
1219 SignalIsolateEvent(DebuggerEvent::kIsolateShutdown); 1220 SignalIsolateEvent(DebuggerEvent::kIsolateShutdown);
1220 } 1221 }
1221 } 1222 }
1222 1223
1223 1224
1224 static RawFunction* ResolveLibraryFunction( 1225 static RawFunction* ResolveLibraryFunction(
1225 const Library& library, 1226 const Library& library,
1226 const String& fname) { 1227 const String& fname) {
1227 ASSERT(!library.IsNull()); 1228 ASSERT(!library.IsNull());
1228 const Object& object = Object::Handle(library.ResolveName(fname)); 1229 const Object& object = Object::Handle(library.ResolveName(fname));
(...skipping 1723 matching lines...) Expand 10 before | Expand all | Expand 10 after
2952 } 2953 }
2953 2954
2954 2955
2955 void Debugger::RegisterCodeBreakpoint(CodeBreakpoint* bpt) { 2956 void Debugger::RegisterCodeBreakpoint(CodeBreakpoint* bpt) {
2956 ASSERT(bpt->next() == NULL); 2957 ASSERT(bpt->next() == NULL);
2957 bpt->set_next(code_breakpoints_); 2958 bpt->set_next(code_breakpoints_);
2958 code_breakpoints_ = bpt; 2959 code_breakpoints_ = bpt;
2959 } 2960 }
2960 2961
2961 } // namespace dart 2962 } // namespace dart
OLDNEW
« 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