Transitioning to new IC structure: change IC data to include function name; pass IC data instead ...

runtime/vm/ic_stubs_ia32.cc

 // Copyright (c) 2011, 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/globals.h"  // Needed here to get TARGET_ARCH_IA32.
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/ic_stubs.h"
 
 #include "vm/assembler.h"
@@ skipping 175 matching lines @@
   TestEaxIsSmi test_smi(instruction_address);
   // The target of the Smi test determines if the test should cause
   // IC miss if successful or jump to target (IC hit). Target of IC miss is the
   // stub code, target of IC success is a code object.
   CodeIndexTable* ci_table = Isolate::Current()->code_index_table();
   ASSERT(ci_table != NULL);
 
   Instructions& inst = Instructions::Handle(
       Instructions::FromEntryPoint(ic_entry_point));
   ASSERT(!inst.IsNull());
-  ICData ic_data(Code::Handle(inst.code()));
-  if (patch_code) {
-    const Function& from_function =
-        Function::Handle(ci_table->LookupFunction(from));
-    const Function& to_function =
-        Function::Handle(ci_table->LookupFunction(to));
-    ic_data.ChangeTargets(from_function, to_function);
-  }
 
   if (!StubCode::InCallInstanceFunctionStubCode(test_smi.TargetAddress())) {
     // Jump is an IC success.
     if (patch_code && (test_smi.TargetAddress() == from)) {
       test_smi.SetTargetAddress(to);
     }
     const Class& smi_class =
         Class::ZoneHandle(Isolate::Current()->object_store()->smi_class());
     const Code& smi_code =
         Code::Handle(ci_table->LookupCode(test_smi.TargetAddress()));
@@ skipping 13 matching lines @@
   // Part B: Load receiver's class, compare with all known classes.
   LoadObjectClass load_object_class(instruction_address);
   if (!load_object_class.IsValid()) {
     return false;
   }
   instruction_address += load_object_class.pattern_length_in_bytes();
   while (true) {
     ICCheckReceiverClass check_class(instruction_address);
     if (!check_class.IsValid()) {
       // Done parsing.
-#if defined(DEBUG)
-      // Classes can be set to NULL if we do not care about collecting them.
-      if (classes != NULL) {
-        ic_data.CheckIsSame(classes, targets);
-      }
-#endif
       return true;
     }
     if (patch_code && (check_class.TargetAddress() == from)) {
       check_class.SetTargetAddress(to);
     }
     const Class& cls = Class::ZoneHandle(check_class.TestClass());
     const Code& code = Code::ZoneHandle(
         ci_table->LookupCode(check_class.TargetAddress()));
     ASSERT(!cls.IsNullClass());
     ASSERT(!code.IsNull());
@@ skipping 102 matching lines @@
           Function::Handle(
               code_index_table->LookupFunction(target.EntryPoint()));
       OS::Print("%d: Code for inline cache for class '%s' function '%s': {\n",
           i, class_name.ToCString(), function.ToFullyQualifiedCString());
     }
     Disassembler::Disassemble(ic_stub_code.EntryPoint(),
                               ic_stub_code.EntryPoint() + assembler.CodeSize());
     OS::Print("}\n");
   }
 
-  ICData ic_data(ic_stub_code);
-  ic_data.SetICDataArray(1, classes.length());
-  ASSERT(classes.length() == targets.length());
-  for (intptr_t i = 0; i < classes.length(); i++) {
-    GrowableArray<const Class*> temp_classes;
-    temp_classes.Add(classes[i]);
-    ic_data.SetCheckAt(i, temp_classes, *(targets[i]));
-  }
   return ic_stub_code.raw();
 #undef __
 }
 
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32