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

runtime/vm/code_generator.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/code_generator.h"
 
 #include "vm/code_index_table.h"
 #include "vm/code_patcher.h"
 #include "vm/compiler.h"
 #include "vm/dart_entry.h"
 #include "vm/exceptions.h"
+#include "vm/ic_data.h"
 #include "vm/ic_stubs.h"
 #include "vm/object_store.h"
 #include "vm/resolver.h"
 #include "vm/runtime_entry.h"
 #include "vm/stack_frame.h"
 #include "vm/verifier.h"
 
 namespace dart {
 
 DEFINE_FLAG(bool, inline_cache, true, "enable inline caches");
@@ skipping 523 matching lines @@
     }
     cls = cls.SuperClass();
   }
   return function.raw();
 }
 
 
 // Resolve an implicit closure by checking if an instance function
 // of the same name exists and creating a closure object of the function.
 // Arg0: receiver object.
-// Arg1: original function name.
+// Arg1: ic-data array.
 // Returns: Closure object or NULL (instance function not found).
 // This is called by the megamorphic stub when it is unable to resolve an
 // instance method. This is done just before the call to noSuchMethod.
 DEFINE_RUNTIME_ENTRY(ResolveImplicitClosureFunction, 2) {
   ASSERT(arguments.Count() ==
          kResolveImplicitClosureFunctionRuntimeEntry.argument_count());
   const Instance& receiver = Instance::CheckedHandle(arguments.At(0));
-  const String& original_func_name = String::CheckedHandle(arguments.At(1));
+  const Array& ic_data_array = Array::CheckedHandle(arguments.At(1));
+  ICData ic_data(ic_data_array);
+  const String& original_function_name = String::Handle(ic_data.FunctionName());
   const String& getter_prefix = String::Handle(String::New("get:"));
   Closure& closure = Closure::Handle();
-  if (!original_func_name.StartsWith(getter_prefix)) {
+  if (!original_function_name.StartsWith(getter_prefix)) {
     // This is not a getter so can't be the case where we are trying to
     // create an implicit closure of an instance function.
     arguments.SetReturn(closure);
     return;
   }
   Class& receiver_class = Class::Handle();
   receiver_class ^= receiver.clazz();
   ASSERT(!receiver_class.IsNull());
   String& func_name = String::Handle();
-  func_name = String::SubString(original_func_name, getter_prefix.Length());
+  func_name = String::SubString(original_function_name, getter_prefix.Length());
   func_name = String::NewSymbol(func_name);
   const Function& function =
       Function::Handle(LookupDynamicFunction(receiver_class, func_name));
   if (function.IsNull()) {
     // There is no function of the same name so can't be the case where
     // we are trying to create an implicit closure of an instance function.
     arguments.SetReturn(closure);
     return;
   }
   Function& implicit_closure_function =
       Function::Handle(function.ImplicitClosureFunction());
   // Create a closure object for the implicit closure function.
   const Context& context = Context::Handle(Context::New(1));
   context.SetAt(0, receiver);
   closure = Closure::New(implicit_closure_function, context);
   arguments.SetReturn(closure);
 }
 
 
 // Resolve an implicit closure by invoking getter and checking if the return
 // value from getter is a closure.
 // Arg0: receiver object.
-// Arg1: original function name.
+// Arg1: ic-data array.
 // Returns: Closure object or NULL (closure not found).
 // This is called by the megamorphic stub when it is unable to resolve an
 // instance method. This is done just before the call to noSuchMethod.
 DEFINE_RUNTIME_ENTRY(ResolveImplicitClosureThroughGetter, 2) {
   ASSERT(arguments.Count() ==
          kResolveImplicitClosureThroughGetterRuntimeEntry.argument_count());
   const Instance& receiver = Instance::CheckedHandle(arguments.At(0));
-  const String& original_function_name = String::CheckedHandle(arguments.At(1));
+  const Array& ic_data_array = Array::CheckedHandle(arguments.At(1));
+  ICData ic_data(ic_data_array);
+  const String& original_function_name = String::Handle(ic_data.FunctionName());
   const int kNumArguments = 1;
   const int kNumNamedArguments = 0;
   const String& getter_function_name =
       String::Handle(Field::GetterName(original_function_name));
   Function& function = Function::ZoneHandle(
       Resolver::ResolveDynamic(receiver,
                                getter_function_name,
                                kNumArguments,
                                kNumNamedArguments));
   Code& code = Code::Handle();
@@ skipping 93 matching lines @@
                  adjusted_arg_descriptor,
                  invoke_arguments.data(),
                  context));
   CheckResultException(result);
   arguments.SetReturn(result);
 }
 
 
 // Invoke appropriate noSuchMethod function.
 // Arg0: receiver.
-// Arg1: original function name.
+// Arg1: ic-data array.
 // Arg2: original arguments descriptor array.
 // Arg3: original arguments array.
 DEFINE_RUNTIME_ENTRY(InvokeNoSuchMethodFunction, 4) {
   ASSERT(arguments.Count() ==
          kInvokeNoSuchMethodFunctionRuntimeEntry.argument_count());
   const Instance& receiver = Instance::CheckedHandle(arguments.At(0));
-  const String& original_function_name = String::CheckedHandle(arguments.At(1));
+  const Array& ic_data_array = Array::CheckedHandle(arguments.At(1));
+  ICData ic_data(ic_data_array);
+  const String& original_function_name = String::Handle(ic_data.FunctionName());
   ASSERT(!Array::CheckedHandle(arguments.At(2)).IsNull());
   const Array& orig_arguments = Array::CheckedHandle(arguments.At(3));
   // TODO(regis): The signature of the "noSuchMethod" method has to change from
   // noSuchMethod(String name, Array arguments) to something like
   // noSuchMethod(InvocationMirror call).
   const int kNumArguments = 3;
   const int kNumNamedArguments = 0;
   const Array& kNoArgumentNames = Array::Handle();
   const String& function_name =
       String::Handle(String::NewSymbol("noSuchMethod"));
@@ skipping 269 matching lines @@
       }
     }
   }
   // The cache is null terminated, therefore the loop above should never
   // terminate by itself.
   UNREACHABLE();
   return Code::null();
 }
 
 }  // namespace dart