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

runtime/vm/debugger.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_DEBUGGER_H_
 #define VM_DEBUGGER_H_
 
 #include "include/dart_debugger_api.h"
 
 #include "vm/object.h"
@@ skipping 61 matching lines @@
   friend class Debugger;
   DISALLOW_COPY_AND_ASSIGN(SourceBreakpoint);
 };
 
 
 // CodeBreakpoint represents a location in compiled code. There may be
 // more than one CodeBreakpoint for one SourceBreakpoint, e.g. when a
 // function gets compiled as a regular function and as a closure.
 class CodeBreakpoint {
  public:
-  CodeBreakpoint(const Code& code, intptr_t pc_desc_index);
+  CodeBreakpoint(const Code& code,
+                 const RawPcDescriptors::PcDescriptorRec& rec);
   ~CodeBreakpoint();
 
   RawFunction* function() const;
   uword pc() const { return pc_; }
   intptr_t token_pos() const { return token_pos_; }
   bool IsInternal() const { return src_bpt_ == NULL; }
 
   RawScript* SourceCode();
   RawString* SourceUrl();
   intptr_t LineNumber();
 
   void Enable();
   void Disable();
   bool IsEnabled() const { return is_enabled_; }
 
   uword OrigStubAddress() const;
 
  private:
   void VisitObjectPointers(ObjectPointerVisitor* visitor);
 
   SourceBreakpoint* src_bpt() const { return src_bpt_; }
   void set_src_bpt(SourceBreakpoint* value) { src_bpt_ = value; }
 
   void set_next(CodeBreakpoint* value) { next_ = value; }
   CodeBreakpoint* next() const { return this->next_; }
-  intptr_t pc_desc_index() const { return pc_desc_index_; }
 
   void PatchCode();
   void RestoreCode();
 
   RawCode* code_;
-  intptr_t pc_desc_index_;
   intptr_t token_pos_;
   uword pc_;
   intptr_t line_number_;
   bool is_enabled_;
 
   SourceBreakpoint* src_bpt_;
   CodeBreakpoint* next_;
 
-  PcDescriptors::Kind breakpoint_kind_;
+  RawPcDescriptors::Kind breakpoint_kind_;
   uword saved_value_;
 
   friend class Debugger;
   DISALLOW_COPY_AND_ASSIGN(CodeBreakpoint);
 };
 
 
 // ActivationFrame represents one dart function activation frame
 // on the call stack.
 class ActivationFrame : public ZoneAllocated {
@@ skipping 50 matching lines @@
   RawObject* Evaluate(const String& expr);
 
   void PrintToJSONObject(JSONObject* jsobj);
 
  private:
   void PrintContextMismatchError(const String& var_name,
                                  intptr_t ctx_slot,
                                  intptr_t frame_ctx_level,
                                  intptr_t var_ctx_level);
 
-  intptr_t PcDescIndex();
   intptr_t TryIndex();
   void GetPcDescriptors();
   void GetVarDescriptors();
   void GetDescIndices();
 
   RawObject* GetLocalVar(intptr_t slot_index);
   RawInstance* GetLocalInstanceVar(intptr_t slot_index);
   RawContext* GetLocalContextVar(intptr_t slot_index);
 
   RawInstance* GetLocalVarValue(intptr_t slot_index);
   RawInstance* GetInstanceCallReceiver(intptr_t num_actual_args);
   RawObject* GetClosureObject(intptr_t num_acatual_args);
 
   uword pc_;
   uword fp_;
   uword sp_;
 
   // The anchor of the context chain for this function.
   Context& ctx_;
   const Code& code_;
   const Function& function_;
   intptr_t token_pos_;
-  intptr_t pc_desc_index_;
+  const RawPcDescriptors::PcDescriptorRec* desc_rec_;
+
   intptr_t line_number_;
   intptr_t column_number_;
   intptr_t context_level_;
 
   // Some frames are deoptimized into a side array in order to inspect them.
   const Array& deopt_frame_;
   const intptr_t deopt_frame_offset_;
 
   bool vars_initialized_;
   LocalVarDescriptors& var_descriptors_;
@@ skipping 322 matching lines @@
 
   friend class Isolate;
   friend class SourceBreakpoint;
   DISALLOW_COPY_AND_ASSIGN(Debugger);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_DEBUGGER_H_