Iterate over PcDescriptors only via iterators, not via an index. (preparation for more compression …

runtime/vm/raw_object.h

 // 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.
 
 #ifndef VM_RAW_OBJECT_H_
 #define VM_RAW_OBJECT_H_
 
 #include "platform/assert.h"
 #include "vm/globals.h"
 #include "vm/token.h"
@@ skipping 884 matching lines @@
 
   friend class RawCode;
   friend class Code;
   friend class StackFrame;
   friend class MarkingVisitor;
   friend class Function;
 };
 
 
 class RawPcDescriptors : public RawObject {
-  RAW_HEAP_OBJECT_IMPLEMENTATION(PcDescriptors);
-
-  intptr_t length_;  // Number of descriptors.
+ public:
+  enum Kind {
+    kDeopt,            // Deoptimization continuation point.
+    kIcCall,           // IC call.
+    kOptStaticCall,    // Call directly to known target, e.g. static call.
+    kUnoptStaticCall,  // Call to a known target via a stub.
+    kClosureCall,      // Closure call.
+    kRuntimeCall,      // Runtime call.
+    kOsrEntry,         // OSR entry point in unoptimized code.
+    kOther
+  };
 
   struct PcDescriptorRec {
     uword pc;
     int32_t deopt_id;
     int32_t token_pos;  // Or deopt reason.
     int16_t try_index;  // Or deopt index.
-    int8_t kind;
+    int8_t kind_;
+
+    Kind kind() const { return static_cast<Kind>(kind_); }
   };
 
+ private:
+  RAW_HEAP_OBJECT_IMPLEMENTATION(PcDescriptors);
+
+  intptr_t length_;  // Number of descriptors.
+
   // Variable length data follows here.
   PcDescriptorRec* data() { OPEN_ARRAY_START(PcDescriptorRec, intptr_t); }
 
   friend class Object;
 };
 
 
 // Stackmap is an immutable representation of the layout of the stack at a
 // PC. The stack map representation consists of a bit map which marks each
 // live object index starting from the base of the frame.
@@ skipping 954 matching lines @@
   COMPILE_ASSERT(kTypedDataInt8ArrayViewCid == kTypedDataInt8ArrayCid + 14);
   COMPILE_ASSERT(kExternalTypedDataInt8ArrayCid ==
                  kTypedDataInt8ArrayViewCid + 15);
   COMPILE_ASSERT(kNullCid == kExternalTypedDataInt8ArrayCid + 14);
   return (kNullCid - kTypedDataInt8ArrayCid);
 }
 
 }  // namespace dart
 
 #endif  // VM_RAW_OBJECT_H_