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

Side by Side Diff: runtime/vm/debugger.cc

Issue 2780163002: Fix crash when determining whether an async exception is handled (Closed)
Patch Set: Created 3 years, 8 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 | « no previous file | no next file » | 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 "platform/address_sanitizer.h" 9 #include "platform/address_sanitizer.h"
10 10
(...skipping 788 matching lines...) Expand 10 before | Expand all | Expand 10 after
799 return Object::null(); 799 return Object::null();
800 } 800 }
801 801
802 802
803 RawObject* ActivationFrame::GetCausalStack() { 803 RawObject* ActivationFrame::GetCausalStack() {
804 return GetAsyncContextVariable(Symbols::AsyncStackTraceVar()); 804 return GetAsyncContextVariable(Symbols::AsyncStackTraceVar());
805 } 805 }
806 806
807 807
808 bool ActivationFrame::HandlesException(const Instance& exc_obj) { 808 bool ActivationFrame::HandlesException(const Instance& exc_obj) {
809 if ((kind_ == kAsyncSuspensionMarker) || (kind_ == kAsyncCausal)) {
810 // These frames are historical.
811 return false;
812 }
809 intptr_t try_index = TryIndex(); 813 intptr_t try_index = TryIndex();
810 if (try_index < 0) { 814 if (try_index < 0) {
811 return false; 815 return false;
812 } 816 }
813 ExceptionHandlers& handlers = ExceptionHandlers::Handle(); 817 ExceptionHandlers& handlers = ExceptionHandlers::Handle();
814 Array& handled_types = Array::Handle(); 818 Array& handled_types = Array::Handle();
815 AbstractType& type = Type::Handle(); 819 AbstractType& type = Type::Handle();
816 const bool is_async = 820 const bool is_async =
817 function().IsAsyncClosure() || function().IsAsyncGenClosure(); 821 function().IsAsyncClosure() || function().IsAsyncGenClosure();
818 handlers = code().exception_handlers(); 822 handlers = code().exception_handlers();
(...skipping 3426 matching lines...) Expand 10 before | Expand all | Expand 10 after
4245 4249
4246 void Debugger::RegisterCodeBreakpoint(CodeBreakpoint* bpt) { 4250 void Debugger::RegisterCodeBreakpoint(CodeBreakpoint* bpt) {
4247 ASSERT(bpt->next() == NULL); 4251 ASSERT(bpt->next() == NULL);
4248 bpt->set_next(code_breakpoints_); 4252 bpt->set_next(code_breakpoints_);
4249 code_breakpoints_ = bpt; 4253 code_breakpoints_ = bpt;
4250 } 4254 }
4251 4255
4252 #endif // !PRODUCT 4256 #endif // !PRODUCT
4253 4257
4254 } // namespace dart 4258 } // namespace dart
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698