Get rid of ast node ids.

runtime/vm/ast.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_AST_H_
 #define VM_AST_H_
 
 #include "platform/assert.h"
 #include "vm/allocation.h"
 #include "vm/growable_array.h"
@@ skipping 74 matching lines @@
 
 #define DECLARE_COMMON_NODE_FUNCTIONS(type)                                    \
   virtual void Visit(AstNodeVisitor* visitor);                                 \
   virtual const char* ShortName() const;                                       \
   virtual bool Is##type() const { return true; }                               \
   virtual type* As##type() { return this; }
 
 
 class AstNode : public ZoneAllocated {
  public:
-  static const int kNoId = -1;
-
   explicit AstNode(intptr_t token_pos)
       : token_pos_(token_pos),
-        id_(GetNextId()),
         ic_data_(ICData::ZoneHandle()),
         info_(NULL) {
     ASSERT(token_pos >= 0);
   }
 
   intptr_t token_pos() const { return token_pos_; }
 
 
   const ICData& ic_data() const { return ic_data_; }
   void set_ic_data(const ICData& value) {
     ic_data_ = value.raw();
   }
 
-  intptr_t id() const { return id_; }
-
   void set_info(CodeGenInfo* info) { info_ = info; }
   CodeGenInfo* info() const { return info_; }
 
 #define AST_TYPE_CHECK(type, name)                                             \
   virtual bool Is##type() const { return false; }                              \
   virtual type* As##type() { return NULL; }
 NODE_LIST(AST_TYPE_CHECK)
 #undef AST_TYPE_CHECK
 
   virtual void Visit(AstNodeVisitor* visitor) = 0;
@@ skipping 25 matching lines @@
   // constant. Otherwise, the return value is an approximation of the
   // actual value of the const expression. The type of the returned value
   // corresponds to the type of the const expression and is either
   // Number, Integer, String, Bool, or anything else (not a subtype of
   // the former).
   virtual const Instance* EvalConstExpr() const { return NULL; }
 
  protected:
   friend class ParsedFunction;
 
-  static intptr_t GetNextId() {
-    Isolate* isolate = Isolate::Current();
-    intptr_t tmp = isolate->ast_node_id();
-    isolate->set_ast_node_id(tmp + 1);
-    return tmp;
-  }
-
  private:
   const intptr_t token_pos_;
-  // Unique id per function compiled, used to match AST node to a PC.
-  const intptr_t id_;
   // IC data collected for this node.
   ICData& ic_data_;
   // Used by optimizing compiler.
   CodeGenInfo* info_;
   DISALLOW_COPY_AND_ASSIGN(AstNode);
 };
 
 
 class SequenceNode : public AstNode {
  public:
   SequenceNode(intptr_t token_pos, LocalScope* scope)
     : AstNode(token_pos),
       scope_(scope),
       nodes_(4),
-      label_(NULL),
-      first_parameter_id_(AstNode::kNoId),
-      last_parameter_id_(AstNode::kNoId) {
+      label_(NULL) {
   }
 
   LocalScope* scope() const { return scope_; }
 
   SourceLabel* label() const { return label_; }
   void set_label(SourceLabel* value) { label_ = value; }
 
   void VisitChildren(AstNodeVisitor* visitor) const;
 
   void Add(AstNode* node) { nodes_.Add(node); }
   intptr_t length() const { return nodes_.length(); }
   AstNode* NodeAt(intptr_t index) const { return nodes_[index]; }
 
-  void set_first_parameter_id(intptr_t value) { first_parameter_id_ = value; }
-  void set_last_parameter_id(intptr_t value) { last_parameter_id_ = value; }
-  intptr_t ParameterIdAt(intptr_t param_pos) const {
-    ASSERT(first_parameter_id_ != AstNode::kNoId);
-    ASSERT(last_parameter_id_ != AstNode::kNoId);
-    ASSERT(param_pos <= (last_parameter_id_ - first_parameter_id_));
-    return first_parameter_id_ + param_pos;
-  }
-
   DECLARE_COMMON_NODE_FUNCTIONS(SequenceNode);
 
   // Collects all nodes accessible from this sequence node into array 'nodes'.
   void CollectAllNodes(GrowableArray<AstNode*>* nodes);
 
  private:
   LocalScope* scope_;
   GrowableArray<AstNode*> nodes_;
   SourceLabel* label_;
-  intptr_t first_parameter_id_;
-  intptr_t last_parameter_id_;
 
   DISALLOW_COPY_AND_ASSIGN(SequenceNode);
 };
 
 
 class CloneContextNode : public AstNode {
  public:
   explicit CloneContextNode(intptr_t token_pos)
     : AstNode(token_pos) {
   }
@@ skipping 1428 matching lines @@
   const LocalVariable& context_var_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(InlinedFinallyNode);
 };
 
 }  // namespace dart
 
 #undef DECLARE_COMMON_NODE_FUNCTIONS
 
 #endif  // VM_AST_H_