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

Unified Diff: runtime/vm/code_descriptors.h

Issue 1002933002: Fix issue 22800: Unreachable exception handlers do not have their handler types initialized. Initia… (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 5 years, 9 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 | « no previous file | runtime/vm/code_descriptors.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/code_descriptors.h
===================================================================
--- runtime/vm/code_descriptors.h (revision 44434)
+++ runtime/vm/code_descriptors.h (working copy)
@@ -162,28 +162,8 @@
return false;
}
+ RawExceptionHandlers* FinalizeExceptionHandlers(uword entry_point) const;
- RawExceptionHandlers* FinalizeExceptionHandlers(uword entry_point) {
- intptr_t num_handlers = Length();
- if (num_handlers == 0) {
- return Object::empty_exception_handlers().raw();
- }
- const ExceptionHandlers& handlers =
- ExceptionHandlers::Handle(ExceptionHandlers::New(num_handlers));
- for (intptr_t i = 0; i < num_handlers; i++) {
- // Assert that every element in the array has been initialized.
- ASSERT(list_[i].handler_types != NULL);
- bool has_catch_all = ContainsDynamic(*list_[i].handler_types);
- handlers.SetHandlerInfo(i,
- list_[i].outer_try_index,
- list_[i].pc_offset,
- list_[i].needs_stacktrace,
- has_catch_all);
- handlers.SetHandledTypes(i, *list_[i].handler_types);
- }
- return handlers.raw();
- }
-
private:
GrowableArray<struct HandlerDesc> list_;
DISALLOW_COPY_AND_ASSIGN(ExceptionHandlerList);
« no previous file with comments | « no previous file | runtime/vm/code_descriptors.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698