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

Unified Diff: runtime/vm/stack_frame.cc

Issue 356923006: Iterate over PcDescriptors only via iterators, not via an index. (preparation for more compression … (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 years, 5 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
« runtime/vm/debugger.cc ('K') | « runtime/vm/simulator_arm.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/stack_frame.cc
===================================================================
--- runtime/vm/stack_frame.cc (revision 38030)
+++ runtime/vm/stack_frame.cc (working copy)
@@ -224,11 +224,11 @@
REUSABLE_PC_DESCRIPTORS_HANDLESCOPE(isolate);
PcDescriptors& descriptors = reused_pc_descriptors_handle.Handle();
descriptors = code.pc_descriptors();
- const intptr_t len = descriptors.Length();
- for (intptr_t i = 0; i < len; i++) {
- if ((static_cast<uword>(descriptors.PC(i)) == pc()) &&
- (descriptors.TryIndex(i) != -1)) {
- const intptr_t try_index = descriptors.TryIndex(i);
+ PcDescriptors::Iterator iter(descriptors);
+ while (iter.HasNext()) {
+ const RawPcDescriptors::PcDescriptorRec& rec = iter.Next();
+ if ((rec.pc == pc()) && (rec.try_index != -1)) {
+ const intptr_t try_index = rec.try_index;
RawExceptionHandlers::HandlerInfo handler_info;
handlers.GetHandlerInfo(try_index, &handler_info);
*handler_pc = handler_info.handler_pc;
@@ -249,9 +249,11 @@
const PcDescriptors& descriptors =
PcDescriptors::Handle(code.pc_descriptors());
ASSERT(!descriptors.IsNull());
- for (int i = 0; i < descriptors.Length(); i++) {
- if (static_cast<uword>(descriptors.PC(i)) == pc()) {
- return descriptors.TokenPos(i);
+ PcDescriptors::Iterator iter(descriptors);
+ while (iter.HasNext()) {
+ const RawPcDescriptors::PcDescriptorRec& rec = iter.Next();
+ if (rec.pc == pc()) {
+ return rec.token_pos;
}
}
return -1;
« runtime/vm/debugger.cc ('K') | « runtime/vm/simulator_arm.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698