Remove the IC data array from the isolate.

runtime/vm/intermediate_language.h

 // Copyright (c) 2013, 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_INTERMEDIATE_LANGUAGE_H_
 #define VM_INTERMEDIATE_LANGUAGE_H_
 
 #include "vm/allocation.h"
 #include "vm/ast.h"
 #include "vm/growable_array.h"
@@ skipping 628 matching lines @@
         env_(NULL),
         expr_id_(kNoExprId) { }
 
   virtual Tag tag() const = 0;
 
   intptr_t deopt_id() const {
     ASSERT(CanDeoptimize() || CanBeDeoptimizationTarget());
     return deopt_id_;
   }
 
+  ICData* GetICData(const Array& ic_data_array) const;
+
   bool IsBlockEntry() { return (AsBlockEntry() != NULL); }
   virtual BlockEntryInstr* AsBlockEntry() { return NULL; }
 
   bool IsDefinition() { return (AsDefinition() != NULL); }
   virtual Definition* AsDefinition() { return NULL; }
 
   bool IsControl() { return (AsControl() != NULL); }
   virtual ControlInstruction* AsControl() { return NULL; }
 
   virtual intptr_t InputCount() const = 0;
@@ skipping 1925 matching lines @@
 };
 
 
 class InstanceCallInstr : public TemplateDefinition<0> {
  public:
   InstanceCallInstr(intptr_t token_pos,
                     const String& function_name,
                     Token::Kind token_kind,
                     ZoneGrowableArray<PushArgumentInstr*>* arguments,
                     const Array& argument_names,
-                    intptr_t checked_argument_count)
-      : ic_data_(Isolate::Current()->GetICDataForDeoptId(deopt_id())),
+                    intptr_t checked_argument_count,
+                    const Array& ic_data_array)
+      : ic_data_(GetICData(ic_data_array)),
         token_pos_(token_pos),
         function_name_(function_name),
         token_kind_(token_kind),
         arguments_(arguments),
         argument_names_(argument_names),
         checked_argument_count_(checked_argument_count) {
     ASSERT(function_name.IsNotTemporaryScopedHandle());
     ASSERT(!arguments->is_empty());
     ASSERT(argument_names.IsZoneHandle());
     ASSERT(Token::IsBinaryOperator(token_kind) ||
@@ skipping 220 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(StrictCompareInstr);
 };
 
 
 class EqualityCompareInstr : public ComparisonInstr {
  public:
   EqualityCompareInstr(intptr_t token_pos,
                        Token::Kind kind,
                        Value* left,
-                       Value* right)
+                       Value* right,
+                       const Array& ic_data_array)
       : ComparisonInstr(kind, left, right),
+        ic_data_(GetICData(ic_data_array)),
         token_pos_(token_pos),
         receiver_class_id_(kIllegalCid) {
-    // deopt_id() checks receiver_class_id_ value.
-    ic_data_ = Isolate::Current()->GetICDataForDeoptId(deopt_id());
     ASSERT((kind == Token::kEQ) || (kind == Token::kNE));
   }
 
   DECLARE_INSTRUCTION(EqualityCompare)
   virtual CompileType ComputeType() const;
   virtual bool RecomputeType();
 
   const ICData* ic_data() const { return ic_data_; }
   bool HasICData() const {
     return (ic_data() != NULL) && !ic_data()->IsNull();
@@ skipping 53 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(EqualityCompareInstr);
 };
 
 
 class RelationalOpInstr : public ComparisonInstr {
  public:
   RelationalOpInstr(intptr_t token_pos,
                     Token::Kind kind,
                     Value* left,
-                    Value* right)
+                    Value* right,
+                    const Array& ic_data_array)
       : ComparisonInstr(kind, left, right),
+        ic_data_(GetICData(ic_data_array)),
         token_pos_(token_pos),
         operands_class_id_(kIllegalCid) {
-    // deopt_id() checks operands_class_id_ value.
-    ic_data_ = Isolate::Current()->GetICDataForDeoptId(deopt_id());
     ASSERT(Token::IsRelationalOperator(kind));
   }
 
   DECLARE_INSTRUCTION(RelationalOp)
   virtual CompileType ComputeType() const;
   virtual bool RecomputeType();
 
   const ICData* ic_data() const { return ic_data_; }
   bool HasICData() const {
     return (ic_data() != NULL) && !ic_data()->IsNull();
@@ skipping 3474 matching lines @@
   ForwardInstructionIterator* current_iterator_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_