Only store IC data with instructions that collect type feedback.

runtime/vm/il_printer.cc

 // 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.
 
 #include "vm/il_printer.h"
 
 #include "vm/intermediate_language.h"
 #include "vm/os.h"
 #include "vm/parser.h"
 
@@ skipping 118 matching lines @@
   f->Print("]");
 }
 
 
 void Computation::PrintTo(BufferFormatter* f) const {
   // Do not access 'deopt_id()' as it asserts that the computation can
   // deoptimize.
   f->Print("%s:%d(", DebugName(), deopt_id_);
   PrintOperandsTo(f);
   f->Print(")");
-  if (HasICData()) {
-    PrintICData(f, *ic_data());
-  }
 }
 
 
 void Computation::PrintOperandsTo(BufferFormatter* f) const {
   for (int i = 0; i < InputCount(); ++i) {
     if (i > 0) f->Print(", ");
     if (InputAt(i) != NULL) InputAt(i)->PrintTo(f);
   }
 }
 
@@ skipping 40 matching lines @@
   }
 }
 
 
 void InstanceCallComp::PrintOperandsTo(BufferFormatter* f) const {
   f->Print("%s", function_name().ToCString());
   for (intptr_t i = 0; i < ArgumentCount(); ++i) {
     f->Print(", ");
     ArgumentAt(i)->value()->PrintTo(f);
   }
+  if (HasICData()) {
+    PrintICData(f, *ic_data());
+  }
 }
 
 
 void PolymorphicInstanceCallComp::PrintTo(BufferFormatter* f) const {
   f->Print("%s(", DebugName());
   instance_call()->PrintOperandsTo(f);
   f->Print(") ");
-  if (HasICData()) {
-    PrintICData(f, *ic_data());
-  }
+  PrintICData(f, ic_data());
 }
 
 
 void StrictCompareComp::PrintOperandsTo(BufferFormatter* f) const {
   f->Print("%s, ", Token::Str(kind()));
   left()->PrintTo(f);
   f->Print(", ");
   right()->PrintTo(f);
 }
 
 
 void EqualityCompareComp::PrintOperandsTo(BufferFormatter* f) const {
   left()->PrintTo(f);
   f->Print(" %s ", Token::Str(kind()));
   right()->PrintTo(f);
+  if (HasICData()) {
+    PrintICData(f, *ic_data());
+  }
 }
 
 
 void StaticCallComp::PrintOperandsTo(BufferFormatter* f) const {
   f->Print("%s ", String::Handle(function().name()).ToCString());
   for (intptr_t i = 0; i < ArgumentCount(); ++i) {
     if (i > 0) f->Print(", ");
     ArgumentAt(i)->value()->PrintTo(f);
   }
 }
@@ skipping 53 matching lines @@
   instantiator_type_arguments()->PrintTo(f);
   f->Print(")");
 }
 
 
 void RelationalOpComp::PrintOperandsTo(BufferFormatter* f) const {
   f->Print("%s, ", Token::Str(kind()));
   left()->PrintTo(f);
   f->Print(", ");
   right()->PrintTo(f);
+  if (HasICData()) {
+    PrintICData(f, *ic_data());
+  }
 }
 
 
 void AllocateObjectComp::PrintOperandsTo(BufferFormatter* f) const {
   f->Print("%s", Class::Handle(constructor().Owner()).ToCString());
   for (intptr_t i = 0; i < ArgumentCount(); i++) {
     f->Print(", ");
     ArgumentAt(i)->value()->PrintTo(f);
   }
 }
@@ skipping 98 matching lines @@
 
 
 void UnarySmiOpComp::PrintOperandsTo(BufferFormatter* f) const {
   f->Print("%s, ", Token::Str(op_kind()));
   value()->PrintTo(f);
 }
 
 
 void CheckClassComp::PrintOperandsTo(BufferFormatter* f) const {
   value()->PrintTo(f);
-  f->Print(", cid={");
-  for (intptr_t i = 0; i < ic_data()->NumberOfChecks(); i++) {
-    f->Print("%d ", ic_data()->GetReceiverClassIdAt(i));
-  }
-  f->Print("}");
+  PrintICData(f, unary_checks());
 }
 
 
 void GraphEntryInstr::PrintTo(BufferFormatter* f) const {
   f->Print("%2d: [graph]", block_id());
   if (start_env_ != NULL) {
     f->Print("\n{\n");
     const GrowableArray<Value*>& values = start_env_->values();
     for (intptr_t i = 0; i < values.length(); i++) {
       Definition* def = values[i]->definition();
@@ skipping 375 matching lines @@
     if ((locations_ != NULL) && !locations_[i].IsInvalid()) {
       f->Print(" [");
       locations_[i].PrintTo(f);
       f->Print("]");
     }
   }
   f->Print(" }");
 }
 
 }  // namespace dart