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

runtime/vm/code_generator_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/code_generator.h"
 
 #include "lib/error.h"
 #include "vm/ast_printer.h"
 #include "vm/dart_entry.h"
+#include "vm/ic_data.h"
 #include "vm/longjump.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/parser.h"
 #include "vm/resolver.h"
 #include "vm/stub_code.h"
 
 namespace dart {
 
 DEFINE_FLAG(bool, print_ast, false, "Print abstract syntax tree.");
@@ skipping 226 matching lines @@
   CodeGeneratorState codegen_state(this);
   if (FLAG_print_scopes && FLAG_print_ast) {
     // Print the function scope before code generation.
     AstPrinter::PrintFunctionScope(parsed_function_);
   }
   if (FLAG_print_ast) {
     // Print the function ast before code generation.
     AstPrinter::PrintFunctionNodes(parsed_function_);
   }
   if (FLAG_trace_functions) {
-    // Preserve ECX (function name or object) and EDX (arguments descriptor).
+    // Preserve ECX (ic-data array or object) and EDX (arguments descriptor).
     __ pushl(ECX);
     __ pushl(EDX);
     const Function& function =
         Function::ZoneHandle(parsed_function_.function().raw());
     __ LoadObject(EAX, function);
     __ pushl(EAX);
     GenerateCallRuntime(0, kTraceFunctionEntryRuntimeEntry);
     __ popl(EAX);
     __ popl(EDX);
     __ popl(ECX);
@@ skipping 197 matching lines @@
 
 void CodeGenerator::GenerateInstanceCall(
     intptr_t node_id,
     intptr_t token_index,
     const String& function_name,
     int num_arguments,
     const Array& optional_arguments_names) {
   // Set up the function name and number of arguments (including the receiver)
   // to the InstanceCall stub which will resolve the correct entrypoint for
   // the operator and call it.
-  __ LoadObject(ECX, function_name);
+  ICData ic_data(function_name, 1);
+  __ LoadObject(ECX, Array::ZoneHandle(ic_data.data()));
   __ LoadObject(EDX, ArgumentsDescriptor(num_arguments,
                                          optional_arguments_names));
   __ call(&StubCode::CallInstanceFunctionLabel());
   AddCurrentDescriptor(PcDescriptors::kIcCall,
                        node_id,
                        token_index);
   __ addl(ESP, Immediate(num_arguments * kWordSize));
 }
 
 
@@ skipping 203 matching lines @@
     Label all_arguments_processed;
     __ cmpl(Address(EDI, 0), raw_null);
     __ j(EQUAL, &all_arguments_processed, Assembler::kNearJump);
 
     __ Bind(&wrong_num_arguments);
     if (function.IsClosureFunction()) {
       GenerateCallRuntime(function.token_index(),
                           kClosureArgumentMismatchRuntimeEntry);
     } else {
       // Invoke noSuchMethod function.
-      __ LoadObject(ECX, String::ZoneHandle(function.name()));
+      ICData ic_data(String::Handle(function.name()), 1);
+      __ LoadObject(ECX, Array::ZoneHandle(ic_data.data()));
       // EBP : points to previous frame pointer.
       // EBP + 4 : points to return address.
       // EBP + 8 : address of last argument (arg n-1).
       // ESP + 8 + 4*(n-1) : address of first argument (arg 0).
-      // ECX : function name.
+      // ECX : ic-data array.
       // EDX : arguments descriptor array.
       __ call(&StubCode::CallNoSuchMethodFunctionLabel());
     }
 
     if (FLAG_trace_functions) {
       __ pushl(EAX);  // Preserve result.
       __ PushObject(function);
       GenerateCallRuntime(0, kTraceFunctionExitRuntimeEntry);
       __ popl(EAX);  // Remove argument.
       __ popl(EAX);  // Restore result.
@@ skipping 1904 matching lines @@
   const Class& cls = Class::Handle(parsed_function_.function().owner());
   const Script& script = Script::Handle(cls.script());
   Parser::ReportMsg(script, token_index, "Error", error_msg, format, args);
   Isolate::Current()->long_jump_base()->Jump(1, error_msg);
   UNREACHABLE();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32