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

runtime/vm/object_test.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "platform/globals.h"
 
 #include "vm/assembler.h"
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart_api_impl.h"
@@ skipping 2728 matching lines @@
   extern void GenerateIncrement(Assembler* assembler);
   Assembler _assembler_;
   GenerateIncrement(&_assembler_);
   Code& code = Code::Handle(Code::FinalizeCode(
       *CreateFunction("Test_Code"), &_assembler_));
   code.set_pc_descriptors(descriptors);
 
   // 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);
+
+  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());
+
+  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);
+
+  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());
-
-  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());
-
-  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());
-
-  EXPECT_EQ(30, rec1.token_pos());
-  EXPECT_EQ(40, rec2.token_pos());
-  EXPECT_EQ(40, rec3.token_pos());
-  EXPECT_EQ(80, rec4.token_pos());
 }
 
 
 TEST_CASE(PcDescriptorsCompressed) {
   const int kNumEntries = 6;
   // Add PcDescriptors to the code.
   PcDescriptors& descriptors = PcDescriptors::Handle();
   // PcDescritpors have no try-index.
   descriptors ^= PcDescriptors::New(kNumEntries, false);
   descriptors.AddDescriptor(0, 10, RawPcDescriptors::kOther, 1, 20, -1);
   descriptors.AddDescriptor(1, 20, RawPcDescriptors::kDeopt, 2, 30, -1);
   descriptors.AddDescriptor(2, 30, RawPcDescriptors::kOther, 3, 40, -1);
   descriptors.AddDescriptor(3, 10, RawPcDescriptors::kOther, 4, 40, -1);
   descriptors.AddDescriptor(4, 10, RawPcDescriptors::kOther, 5, 80, -1);
   descriptors.AddDescriptor(5, 80, RawPcDescriptors::kOther, 6, 150, -1);
 
   extern void GenerateIncrement(Assembler* assembler);
   Assembler _assembler_;
   GenerateIncrement(&_assembler_);
   Code& code = Code::Handle(Code::FinalizeCode(
       *CreateFunction("Test_Code"), &_assembler_));
   code.set_pc_descriptors(descriptors);
 
   // 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);
+
+  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());
+
+  iter.NextPc();
+  iter.NextPc();
+  iter.NextPc();
+  iter.NextPc();
+  iter.NextPc();
   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());
-
-  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());
-
-  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());
 }
 
 
 
 static RawClass* CreateTestClass(const char* name) {
   const String& class_name = String::Handle(Symbols::New(name));
   const Class& cls = Class::Handle(
       CreateDummyClass(class_name, Script::Handle()));
   return cls.raw();
 }
@@ skipping 1367 matching lines @@
   EXPECT_VALID(h_result);
   Integer& result = Integer::Handle();
   result ^= Api::UnwrapHandle(h_result);
   String& foo = String::Handle(String::New("foo"));
   Integer& expected = Integer::Handle();
   expected ^= foo.HashCode();
   EXPECT(result.IsIdenticalTo(expected));
 }
 
 }  // namespace dart