One more iteration of PcDescriptor iterator improvement: do not copy record but access individual …

runtime/vm/object_test.cc

Index: runtime/vm/object_test.cc
===================================================================
--- runtime/vm/object_test.cc	(revision 38356)
+++ runtime/vm/object_test.cc	(working copy)
@@ -2746,35 +2746,35 @@
   // Verify the PcDescriptor entries by accessing them.
   const PcDescriptors& pc_descs = PcDescriptors::Handle(code.pc_descriptors());
   PcDescriptors::Iterator iter(pc_descs, RawPcDescriptors::kAnyKind);
-  RawPcDescriptors::PcDescriptorRec rec0;
-  RawPcDescriptors::PcDescriptorRec rec1;
-  RawPcDescriptors::PcDescriptorRec rec2;
-  RawPcDescriptors::PcDescriptorRec rec3;
-  RawPcDescriptors::PcDescriptorRec rec4;
-  RawPcDescriptors::PcDescriptorRec rec5;
-  iter.NextRec(&rec0);
-  iter.NextRec(&rec1);
-  iter.NextRec(&rec2);
-  iter.NextRec(&rec3);
-  iter.NextRec(&rec4);
-  iter.NextRec(&rec5);
-  ASSERT(!iter.HasNext());
 
-  EXPECT_EQ(1, rec0.try_index());
-  EXPECT_EQ(static_cast<uword>(10), rec0.pc());
-  EXPECT_EQ(1, rec0.deopt_id());
-  EXPECT_EQ(20, rec0.token_pos());
+  intptr_t token_pos = iter.NextTokenPos();
+  EXPECT_EQ(20, token_pos);
+  EXPECT_EQ(20, iter.current_token_pos());
+  EXPECT_EQ(1, iter.current_try_index());
+  EXPECT_EQ(static_cast<uword>(10), iter.current_pc());
+  EXPECT_EQ(1, iter.current_deopt_id());
+  EXPECT_EQ(RawPcDescriptors::kOther, iter.current_kind());
 
-  EXPECT_EQ(3, rec5.try_index());
-  EXPECT_EQ(static_cast<uword>(80), rec5.pc());
-  EXPECT_EQ(150, rec5.token_pos());
-  EXPECT_EQ(RawPcDescriptors::kOther, rec0.kind());
-  EXPECT_EQ(RawPcDescriptors::kDeopt, rec1.kind());
+  token_pos = iter.NextTokenPos();
+  EXPECT_EQ(30, token_pos);
+  EXPECT_EQ(RawPcDescriptors::kDeopt, iter.current_kind());
+  token_pos = iter.NextTokenPos();
+  EXPECT_EQ(40, token_pos);
+  token_pos = iter.NextTokenPos();
+  EXPECT_EQ(40, token_pos);
+  token_pos = iter.NextTokenPos();
+  EXPECT_EQ(80, token_pos);
 
-  EXPECT_EQ(30, rec1.token_pos());
-  EXPECT_EQ(40, rec2.token_pos());
-  EXPECT_EQ(40, rec3.token_pos());
-  EXPECT_EQ(80, rec4.token_pos());
+  token_pos = iter.NextTokenPos();
+  EXPECT_EQ(150, token_pos);
+  EXPECT_EQ(150, iter.current_token_pos());
+
+  EXPECT_EQ(3, iter.current_try_index());
+  EXPECT_EQ(static_cast<uword>(80), iter.current_pc());
+  EXPECT_EQ(150, iter.current_token_pos());
+  EXPECT_EQ(RawPcDescriptors::kOther, iter.current_kind());
+
+  ASSERT(!iter.HasNext());
 }
 
 
@@ -2801,35 +2801,24 @@
   // Verify the PcDescriptor entries by accessing them.
   const PcDescriptors& pc_descs = PcDescriptors::Handle(code.pc_descriptors());
   PcDescriptors::Iterator iter(pc_descs, RawPcDescriptors::kAnyKind);
-  RawPcDescriptors::PcDescriptorRec rec0;
-  RawPcDescriptors::PcDescriptorRec rec1;
-  RawPcDescriptors::PcDescriptorRec rec2;
-  RawPcDescriptors::PcDescriptorRec rec3;
-  RawPcDescriptors::PcDescriptorRec rec4;
-  RawPcDescriptors::PcDescriptorRec rec5;
-  iter.NextRec(&rec0);
-  iter.NextRec(&rec1);
-  iter.NextRec(&rec2);
-  iter.NextRec(&rec3);
-  iter.NextRec(&rec4);
-  iter.NextRec(&rec5);
-  ASSERT(!iter.HasNext());
 
-  EXPECT_EQ(-1, rec0.try_index());
-  EXPECT_EQ(static_cast<uword>(10), rec0.pc());
-  EXPECT_EQ(1, rec0.deopt_id());
-  EXPECT_EQ(20, rec0.token_pos());
+  uword pc = iter.NextPc();
+  EXPECT_EQ(static_cast<uword>(10), iter.current_pc());
+  EXPECT_EQ(static_cast<uword>(10), pc);
+  EXPECT_EQ(-1, iter.current_try_index());
+  EXPECT_EQ(1, iter.current_deopt_id());
+  EXPECT_EQ(20, iter.current_token_pos());
 
-  EXPECT_EQ(-1, rec5.try_index());
-  EXPECT_EQ(static_cast<uword>(80), rec5.pc());
-  EXPECT_EQ(150, rec5.token_pos());
-  EXPECT_EQ(RawPcDescriptors::kOther, rec0.kind());
-  EXPECT_EQ(RawPcDescriptors::kDeopt, rec1.kind());
+  iter.NextPc();
+  iter.NextPc();
+  iter.NextPc();
+  iter.NextPc();
+  iter.NextPc();
+  ASSERT(!iter.HasNext());
 
-  EXPECT_EQ(30, rec1.token_pos());
-  EXPECT_EQ(40, rec2.token_pos());
-  EXPECT_EQ(40, rec3.token_pos());
-  EXPECT_EQ(80, rec4.token_pos());
+  EXPECT_EQ(-1, iter.current_try_index());
+  EXPECT_EQ(static_cast<uword>(80), iter.current_pc());
+  EXPECT_EQ(150, iter.current_token_pos());
 }