Chromium Code Reviews| Index: runtime/vm/object.cc |
| =================================================================== |
| --- runtime/vm/object.cc (revision 43100) |
| +++ runtime/vm/object.cc (working copy) |
| @@ -10941,7 +10941,7 @@ |
| void ExceptionHandlers::SetHandlerInfo(intptr_t try_index, |
| intptr_t outer_try_index, |
| - intptr_t handler_pc, |
| + uword handler_pc_offset, |
| bool needs_stacktrace, |
| bool has_catch_all) const { |
| ASSERT((try_index >= 0) && (try_index < num_entries())); |
| @@ -10949,7 +10949,7 @@ |
| RawExceptionHandlers::HandlerInfo* info = |
| UnsafeMutableNonPointer(&raw_ptr()->data()[try_index]); |
| info->outer_try_index = outer_try_index; |
| - info->handler_pc = handler_pc; |
| + info->handler_pc_offset = handler_pc_offset; |
|
srdjan
2015/01/23 16:55:28
Could you add an assert that on 64-bit handler_pc_
Florian Schneider
2015/01/26 15:28:53
Done. I didn't use Utils::IsUint because it does n
|
| info->needs_stacktrace = needs_stacktrace; |
| info->has_catch_all = has_catch_all; |
| } |
| @@ -10963,9 +10963,9 @@ |
| } |
| -intptr_t ExceptionHandlers::HandlerPC(intptr_t try_index) const { |
| +uword ExceptionHandlers::HandlerPCOffset(intptr_t try_index) const { |
| ASSERT((try_index >= 0) && (try_index < num_entries())); |
| - return raw_ptr()->data()[try_index].handler_pc; |
| + return raw_ptr()->data()[try_index].handler_pc_offset; |
| } |
| @@ -11053,7 +11053,7 @@ |
| const intptr_t num_types = handled_types.Length(); |
| len += OS::SNPrint(NULL, 0, kFormat, |
| i, |
| - info.handler_pc, |
| + info.handler_pc_offset, |
| num_types, |
| info.outer_try_index); |
| for (int k = 0; k < num_types; k++) { |
| @@ -11074,7 +11074,7 @@ |
| (len - num_chars), |
| kFormat, |
| i, |
| - info.handler_pc, |
| + info.handler_pc_offset, |
| num_types, |
| info.outer_try_index); |
| for (int k = 0; k < num_types; k++) { |