Revert "Use off-heap data for type feedback in PolymorphicInstanceCallInstr"

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/flow_graph_range_analysis.h"
 #include "vm/intermediate_language.h"
 #include "vm/os.h"
 #include "vm/parser.h"
@@ skipping 177 matching lines @@
 
 
 const char* CompileType::ToCString() const {
   char buffer[1024];
   BufferFormatter f(buffer, sizeof(buffer));
   PrintTo(&f);
   return Thread::Current()->zone()->MakeCopyOfString(buffer);
 }
 
 
-static void PrintTargetsHelper(BufferFormatter* f,
-                               const CallTargets& targets,
-                               intptr_t num_checks_to_print) {
-  f->Print(" IC[");
-  f->Print("%" Pd ": ", targets.length());
-  Function& target = Function::Handle();
-  if ((num_checks_to_print == FlowGraphPrinter::kPrintAll) ||
-      (num_checks_to_print > targets.length())) {
-    num_checks_to_print = targets.length();
-  }
-  for (intptr_t i = 0; i < num_checks_to_print; i++) {
-    const CidRangeTarget& range = targets[i];
-    const intptr_t count = range.count;
-    target ^= range.target->raw();
-    if (i > 0) {
-      f->Print(" | ");
-    }
-    if (range.cid_start == range.cid_end) {
-      const Class& cls =
-          Class::Handle(Isolate::Current()->class_table()->At(range.cid_start));
-      f->Print("%s", String::Handle(cls.Name()).ToCString());
-      f->Print(" cnt:%" Pd " trgt:'%s'", count, target.ToQualifiedCString());
-    } else {
-      const Class& cls = Class::Handle(range.target->Owner());
-      f->Print("cid %" Pd "-%" Pd " %s", range.cid_start, range.cid_end,
-               String::Handle(cls.Name()).ToCString());
-      f->Print(" cnt:%" Pd " trgt:'%s'", count, target.ToQualifiedCString());
-    }
-  }
-  if (num_checks_to_print < targets.length()) {
-    f->Print("...");
-  }
-  f->Print("]");
-}
-
-
 static void PrintICDataHelper(BufferFormatter* f,
                               const ICData& ic_data,
                               intptr_t num_checks_to_print) {
   f->Print(" IC[");
   f->Print("%" Pd ": ", ic_data.NumberOfChecks());
   Function& target = Function::Handle();
   if ((num_checks_to_print == FlowGraphPrinter::kPrintAll) ||
       (num_checks_to_print > ic_data.NumberOfChecks())) {
     num_checks_to_print = ic_data.NumberOfChecks();
   }
@@ skipping 41 matching lines @@
                                    intptr_t num_checks_to_print) {
   char buffer[1024];
   BufferFormatter f(buffer, sizeof(buffer));
   PrintICDataHelper(&f, ic_data, num_checks_to_print);
   THR_Print("%s ", buffer);
   const Array& a = Array::Handle(ic_data.arguments_descriptor());
   THR_Print(" arg-desc %" Pd "\n", a.Length());
 }
 
 
-void FlowGraphPrinter::PrintCidRangeData(const CallTargets& targets,
-                                         intptr_t num_checks_to_print) {
-  char buffer[1024];
-  BufferFormatter f(buffer, sizeof(buffer));
-  PrintTargetsHelper(&f, targets, num_checks_to_print);
-  THR_Print("%s ", buffer);
-  // TODO(erikcorry): Print args descriptor.
-}
-
-
 static void PrintUse(BufferFormatter* f, const Definition& definition) {
   if (definition.HasSSATemp()) {
     if (definition.HasPairRepresentation()) {
       f->Print("(v%" Pd ", v%" Pd ")", definition.ssa_temp_index(),
                definition.ssa_temp_index() + 1);
     } else {
       f->Print("v%" Pd "", definition.ssa_temp_index());
     }
   } else if (definition.HasTemp()) {
     f->Print("t%" Pd "", definition.temp_index());
@@ skipping 191 matching lines @@
   }
 }
 
 
 void PolymorphicInstanceCallInstr::PrintOperandsTo(BufferFormatter* f) const {
   f->Print(" %s", instance_call()->function_name().ToCString());
   for (intptr_t i = 0; i < ArgumentCount(); ++i) {
     f->Print(", ");
     PushArgumentAt(i)->value()->PrintTo(f);
   }
-  PrintTargetsHelper(f, targets_, FlowGraphPrinter::kPrintAll);
+  if (FLAG_display_sorted_ic_data) {
+    PrintICDataSortedHelper(f, ic_data());
+  } else {
+    PrintICDataHelper(f, ic_data(), FlowGraphPrinter::kPrintAll);
+  }
   if (with_checks()) {
     f->Print(" WITH-CHECKS");
   }
   if (complete()) {
     f->Print(" COMPLETE");
   }
 }
 
 
 void StrictCompareInstr::PrintOperandsTo(BufferFormatter* f) const {
@@ skipping 831 matching lines @@
 }
 
 
 bool FlowGraphPrinter::ShouldPrint(const Function& function) {
   return false;
 }
 
 #endif  // !PRODUCT
 
 }  // namespace dart