First part of new ICData infrastructure: use a wrapper object instead of an array.

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"
-#include "vm/ic_data.h"
 #include "vm/scopes.h"
 #include "vm/object.h"
 #include "vm/native_entry.h"
 #include "vm/token.h"
 
 namespace dart {
 
 #define NODE_LIST(V)                                                           \
   V(ReturnNode, "return")                                                      \
   V(LiteralNode, "literal")                                                    \
@@ skipping 74 matching lines @@
   virtual type* As##type() { return this; }
 
 
 class AstNode : public ZoneAllocated {
  public:
   static const int kNoId = -1;
 
   explicit AstNode(intptr_t token_index)
       : token_index_(token_index),
         id_(GetNextId()),
-        ic_data_(Array::ZoneHandle()),
+        ic_data_(ICData::ZoneHandle()),
         info_(NULL) {
     ASSERT(token_index >= 0);
   }
 
   intptr_t token_index() const { return token_index_; }
 
-  virtual void SetIcDataArrayAtId(intptr_t node_id, const Array& value) {
+  virtual void SetIcDataAtId(intptr_t node_id, const ICData& value) {
     ASSERT(id() == node_id);
-    set_ic_data_array(value);
+    set_ic_data(value);
   }
 
   virtual const ICData& ICDataAtId(intptr_t node_id) const {
     ASSERT(id() == node_id);
-    return ic_data();
+    return ic_data_;
   }
 
   virtual bool HasId(intptr_t value) const { return id_ == value; }
 
   intptr_t id() const { return id_; }
 
   void set_info(CodeGenInfo* info) { info_ = info; }
   CodeGenInfo* info() const { return info_; }
 
 #define AST_TYPE_CHECK(type, name)                                             \
@@ skipping 37 matching lines @@
   // Analyzes an expression to determine whether it is a compile time
   // constant or not. Returns NULL if the expression is not a compile time
   // 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:
-  void set_ic_data_array(const Array& value) {
-    ic_data_.set_data(value);
+  const ICData& ic_data() const { return ic_data_; }
+  void set_ic_data(const ICData& value) {
+    ic_data_ = value.raw();
   }
 
-  const ICData& ic_data() const { return ic_data_; }
-
   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_index_;
   // 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_;
+  ICData& ic_data_;
   // Used by optimizing compiler.
   CodeGenInfo* info_;
   DISALLOW_COPY_AND_ASSIGN(AstNode);
 };
 
 
 class SequenceNode : public AstNode {
  public:
   SequenceNode(intptr_t token_index, LocalScope* scope)
     : AstNode(token_index),
@@ skipping 479 matching lines @@
                           bool prefix,
                           AstNode* receiver,
                           const String& field_name)
       : AstNode(token_index),
         kind_(kind),
         prefix_(prefix),
         receiver_(receiver),
         field_name_(field_name),
         operator_id_(AstNode::GetNextId()),
         setter_id_(AstNode::GetNextId()),
-        operator_ic_data_(Array::ZoneHandle()),
-        setter_ic_data_(Array::ZoneHandle()) {
+        operator_ic_data_(ICData::ZoneHandle()),
+        setter_ic_data_(ICData::ZoneHandle()) {
     ASSERT(receiver_ != NULL);
     ASSERT(field_name_.IsZoneHandle());
     ASSERT(kind_ == Token::kINCR || kind_ == Token::kDECR);
   }
 
   Token::Kind kind() const { return kind_; }
   bool prefix() const { return prefix_; }
   AstNode* receiver() const { return receiver_; }
   const String& field_name() const { return field_name_; }
 
   intptr_t getter_id() const { return id(); }
   intptr_t operator_id() const { return operator_id_; }
   intptr_t setter_id() const { return setter_id_; }
 
   virtual bool HasId(intptr_t value) const {
     return (getter_id() == value) ||
            (operator_id() == value) ||
            (setter_id() == value);
   }
 
-  virtual void SetIcDataArrayAtId(intptr_t node_id, const Array& value) {
+  virtual void SetIcDataAtId(intptr_t node_id, const ICData& value) {
     ASSERT(HasId(node_id));
     if (node_id == getter_id()) {
-      set_ic_data_array(value);
+      set_ic_data(value);
     } else if (node_id == operator_id()) {
-      operator_ic_data_.set_data(value);
+      operator_ic_data_ = value.raw();
     } else {
       ASSERT(node_id == setter_id());
-      setter_ic_data_.set_data(value);
+      setter_ic_data_ = value.raw();
     }
   }
 
   virtual const ICData& ICDataAtId(intptr_t node_id) const {
     ASSERT(HasId(node_id));
     if (node_id == getter_id()) {
       return ic_data();
     } else if (node_id == operator_id()) {
       return operator_ic_data_;
     } else {
@@ skipping 10 matching lines @@
 
   DECLARE_COMMON_NODE_FUNCTIONS(IncrOpInstanceFieldNode);
 
  private:
   const Token::Kind kind_;
   const bool prefix_;
   AstNode* receiver_;
   const String& field_name_;
   const intptr_t operator_id_;
   const intptr_t setter_id_;
-  ICData operator_ic_data_;
-  ICData setter_ic_data_;
+  ICData& operator_ic_data_;
+  ICData& setter_ic_data_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(IncrOpInstanceFieldNode);
 };
 
 
 class IncrOpStaticFieldNode : public AstNode {
  public:
   // Access the static field via a call to static getter.
   IncrOpStaticFieldNode(intptr_t token_index,
                         Token::Kind kind,
@@ skipping 56 matching lines @@
                     bool prefix,
                     AstNode* array,
                     AstNode* index)
       : AstNode(token_index),
         kind_(kind),
         prefix_(prefix),
         array_(array),
         index_(index),
         operator_id_(AstNode::GetNextId()),
         store_id_(AstNode::GetNextId()),
-        operator_ic_data_(Array::ZoneHandle()),
-        store_ic_data_(Array::ZoneHandle()) {
+        operator_ic_data_(ICData::ZoneHandle()),
+        store_ic_data_(ICData::ZoneHandle()) {
     ASSERT(kind_ == Token::kINCR || kind_ == Token::kDECR);
     ASSERT(array_ != NULL);
     ASSERT(index_ != NULL);
   }
 
   Token::Kind kind() const { return kind_; }
   bool prefix() const { return prefix_; }
   AstNode* array() const { return array_; }
   AstNode* index() const { return index_; }
 
@@ skipping 12 matching lines @@
     if (node_id == load_id()) {
       return ic_data();
     } else if (node_id == operator_id()) {
       return operator_ic_data_;
     } else {
       ASSERT(node_id == store_id());
       return store_ic_data_;
     }
   }
 
-  virtual void SetIcDataArrayAtId(intptr_t node_id, const Array& value) {
+  virtual void SetIcDataArrayAtId(intptr_t node_id, const ICData& value) {
     ASSERT(HasId(node_id));
     if (node_id == load_id()) {
-      set_ic_data_array(value);
+      set_ic_data(value);
     } else if (node_id == operator_id()) {
-      operator_ic_data_.set_data(value);
+      operator_ic_data_ = value.raw();
     } else {
       ASSERT(node_id == store_id());
-      store_ic_data_.set_data(value);
+      store_ic_data_ = value.raw();
     }
   }
 
   virtual void VisitChildren(AstNodeVisitor* visitor) const {
     array()->Visit(visitor);
     index()->Visit(visitor);
   }
 
   virtual const char* Name() const;
 
   DECLARE_COMMON_NODE_FUNCTIONS(IncrOpIndexedNode);
 
  private:
   const Token::Kind kind_;
   const bool prefix_;
   AstNode* array_;
   AstNode* index_;
   const intptr_t operator_id_;
   const intptr_t store_id_;
-  ICData operator_ic_data_;
-  ICData store_ic_data_;
+  ICData& operator_ic_data_;
+  ICData& store_ic_data_;
 };
 
 
 class ConditionalExprNode : public AstNode {
  public:
   ConditionalExprNode(intptr_t token_index,
                       AstNode* condition,
                       AstNode* true_expr,
                       AstNode* false_expr)
       : AstNode(token_index),
@@ skipping 1007 matching lines @@
   const LocalVariable& context_var_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(InlinedFinallyNode);
 };
 
 }  // namespace dart
 
 #undef DECLARE_COMMON_NODE_FUNCTIONS
 
 #endif  // VM_AST_H_