Get rid of ast node ids.

runtime/vm/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_OBJECT_H_
 #define VM_OBJECT_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/utils.h"
@@ skipping 2184 matching lines @@
   friend class Class;
 };
 
 
 class PcDescriptors : public Object {
  private:
   // Describes the layout of PC descriptor data.
   enum {
     kPcEntry = 0,      // PC value of the descriptor, unique.
     kKindEntry,
-    kNodeIdEntry,      // AST node id.
-    kTokenIndexEntry,  // Token position in source of PC.
+    kDeoptIdEntry,     // Deopt id.
+    kTokenPosEntry,    // Token position in source of PC.
     kTryIndexEntry,    // Try block index of PC.
     // We would potentially be adding other objects here like
     // pointer maps for optimized functions, local variables information  etc.
     kNumberOfEntries
   };
 
  public:
   enum Kind {
-    kDeopt = 0,   // Deoptimization cotinuation point.
+    kDeopt = 0,   // Deoptimization continuation point.
     kDeoptIndex,  // Index into deopt info array.
     kPatchCode,   // Buffer for patching code entry.
     kIcCall,      // IC call.
     kFuncCall,    // Call to known target, e.g. static call, closure call.
     kReturn,      // Return from function.
     kOther
   };
 
   intptr_t Length() const;
 
   uword PC(intptr_t index) const;
   PcDescriptors::Kind DescriptorKind(intptr_t index) const;
   const char* KindAsStr(intptr_t index) const;
-  intptr_t NodeId(intptr_t index) const;
-  intptr_t TokenIndex(intptr_t index) const;
+  intptr_t DeoptId(intptr_t index) const;
+  intptr_t TokenPos(intptr_t index) const;
   intptr_t TryIndex(intptr_t index) const;
   // Index into the deopt-info array of Code object.
   intptr_t DeoptIndex(intptr_t index) const;
 
   void AddDescriptor(intptr_t index,
                      uword pc,
                      PcDescriptors::Kind kind,
-                     intptr_t node_id,
+                     intptr_t deopt_id,
                      intptr_t token_pos,
                      intptr_t try_index) const {
     SetPC(index, pc);
     SetKind(index, kind);
-    SetNodeId(index, node_id);
-    SetTokenIndex(index, token_pos);
+    SetDeoptId(index, deopt_id);
+    SetTokenPos(index, token_pos);
     SetTryIndex(index, try_index);
   }
 
   static const intptr_t kBytesPerElement = (kNumberOfEntries * kWordSize);
   static const intptr_t kMaxElements = kSmiMax / kBytesPerElement;
 
   static intptr_t InstanceSize() {
     ASSERT(sizeof(RawPcDescriptors) == OFFSET_OF(RawPcDescriptors, data_));
     return 0;
   }
   static intptr_t InstanceSize(intptr_t len) {
     ASSERT(0 <= len && len <= kMaxElements);
     return RoundedAllocationSize(
         sizeof(RawPcDescriptors) + (len * kBytesPerElement));
   }
 
   static RawPcDescriptors* New(intptr_t num_descriptors);
 
   // Verify (assert) assumptions about pc descriptors in debug mode.
   void Verify(bool check_ids) const;
 
   // We would have a VisitPointers function here to traverse the
   // pc descriptors table to visit objects if any in the table.
 
  private:
   void SetPC(intptr_t index, uword value) const;
   void SetKind(intptr_t index, PcDescriptors::Kind kind) const;
-  void SetNodeId(intptr_t index, intptr_t value) const;
-  void SetTokenIndex(intptr_t index, intptr_t value) const;
+  void SetDeoptId(intptr_t index, intptr_t value) const;
+  void SetTokenPos(intptr_t index, intptr_t value) const;
   void SetTryIndex(intptr_t index, intptr_t value) const;
 
   void SetLength(intptr_t value) const;
 
   intptr_t* EntryAddr(intptr_t index, intptr_t entry_offset) const {
     ASSERT((index >=0) && (index < Length()));
     intptr_t data_index = (index * kNumberOfEntries) + entry_offset;
     return &raw_ptr()->data_[data_index];
   }
   RawSmi** SmiAddr(intptr_t index, intptr_t entry_offset) const {
@@ skipping 299 matching lines @@
   static RawCode* LookupCode(uword pc);
 
   int32_t GetPointerOffsetAt(int index) const {
     return *PointerOffsetAddrAt(index);
   }
   intptr_t GetTokenIndexOfPC(uword pc) const;
 
   // Find pc of patch code buffer. Return 0 if not found.
   uword GetPatchCodePc() const;
 
-  uword GetDeoptPcAtNodeId(intptr_t node_id) const;
-  uword GetTypeTestAtNodeId(intptr_t node_id) const;
+  uword GetDeoptPcAtDeoptId(intptr_t deopt_id) const;
 
   // Returns true if there is an object in the code between 'start_offset'
   // (inclusive) and 'end_offset' (exclusive).
   bool ObjectExistsInArea(intptr_t start_offest, intptr_t end_offset) const;
 
   // Each (*node_ids)[n] has a an extracted ic data array (*arrays)[n].
   // Returns the maximum id found.
   intptr_t ExtractIcDataArraysAtCalls(
       GrowableArray<intptr_t>* node_ids,
       const GrowableObjectArray& ic_data_objs) const;
@@ skipping 181 matching lines @@
   }
 
   RawString* target_name() const {
     return raw_ptr()->target_name_;
   }
 
   intptr_t num_args_tested() const {
     return raw_ptr()->num_args_tested_;
   }
 
-  intptr_t id() const {
-    return raw_ptr()->id_;
+  intptr_t deopt_id() const {
+    return raw_ptr()->deopt_id_;
   }
 
   intptr_t NumberOfChecks() const;
 
   static intptr_t InstanceSize() {
     return RoundedAllocationSize(sizeof(RawICData));
   }
 
   static intptr_t target_name_offset() {
     return OFFSET_OF(RawICData, target_name_);
@@ skipping 28 matching lines @@
   intptr_t GetReceiverClassIdAt(intptr_t index) const;
   RawFunction* GetTargetAt(intptr_t index) const;
   RawFunction* GetTargetForReceiverClassId(intptr_t class_id) const;
 
   // Returns this->raw() if num_args_tested == 1, otherwise returns a new
   // ICData object containing only unique arg0 checks.
   RawICData* AsUnaryClassChecks() const;
 
   static RawICData* New(const Function& caller_function,
                         const String& target_name,
-                        intptr_t id,
+                        intptr_t deopt_id,
                         intptr_t num_args_tested);
 
  private:
   RawArray* ic_data() const {
     return raw_ptr()->ic_data_;
   }
 
   void set_function(const Function& value) const;
   void set_target_name(const String& value) const;
-  void set_id(intptr_t value) const;
+  void set_deopt_id(intptr_t value) const;
   void set_num_args_tested(intptr_t value) const;
   void set_ic_data(const Array& value) const;
 
   intptr_t TestEntryLength() const;
   void WriteSentinel() const;
 
   HEAP_OBJECT_IMPLEMENTATION(ICData, Object);
   friend class Class;
 };
 
@@ skipping 2582 matching lines @@
     if (this->CharAt(i) != str.CharAt(begin_index + i)) {
       return false;
     }
   }
   return true;
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_