Revert "Change signature of noSuchMethod to take an InvocationMirror."

runtime/vm/code_generator.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/code_generator.h"
 
 #include "vm/assembler_macros.h"
 #include "vm/ast.h"
 #include "vm/code_patcher.h"
 #include "vm/compiler.h"
@@ skipping 1264 matching lines @@
 // 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 ICData& ic_data = ICData::CheckedHandle(arguments.At(1));
   const String& original_function_name = String::Handle(ic_data.target_name());
   ASSERT(!Array::CheckedHandle(arguments.At(2)).IsNull());
   const Array& orig_arguments = Array::CheckedHandle(arguments.At(3));
-  // Allocate an InvocationMirror object.
-  // TODO(regis): Fill in the InvocationMirror object correctly at
-  // this point we do not deal with named arguments and treat them
-  // all as positional.
-  const Library& core_lib = Library::Handle(Library::CoreLibrary());
-  const String& invocation_mirror_name = String::Handle(
-      Symbols::InvocationMirror());
-  Class& invocation_mirror_class = Class::Handle(
-      core_lib.LookupClassAllowPrivate(invocation_mirror_name));
-  ASSERT(!invocation_mirror_class.IsNull());
-  const String& allocation_function_name = String::Handle(
-      Symbols::AllocateInvocationMirror());
-  const Function& allocation_function = Function::ZoneHandle(
-      Resolver::ResolveStaticByName(invocation_mirror_class,
-                                    allocation_function_name,
-                                    Resolver::kIsQualified));
-  ASSERT(!allocation_function.IsNull());
-  GrowableArray<const Object*> allocation_arguments(2);
-  allocation_arguments.Add(&original_function_name);
-  allocation_arguments.Add(&orig_arguments);
+  // 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 Object& invocation_mirror = Object::Handle(
-      DartEntry::InvokeStatic(allocation_function,
-                              allocation_arguments,
-                              kNoArgumentNames));
-
-  const int kNumArguments = 2;
-  const int kNumNamedArguments = 0;
-  const String& function_name = String::Handle(Symbols::NoSuchMethod());
+  const String& function_name =
+      String::Handle(Symbols::NoSuchMethod());
   const Function& function = Function::ZoneHandle(
       Resolver::ResolveDynamic(receiver,
                                function_name,
                                kNumArguments,
                                kNumNamedArguments));
   ASSERT(!function.IsNull());
-  GrowableArray<const Object*> invoke_arguments(1);
-  invoke_arguments.Add(&invocation_mirror);
+  GrowableArray<const Object*> invoke_arguments(2);
+  invoke_arguments.Add(&original_function_name);
+  invoke_arguments.Add(&orig_arguments);
   const Object& result = Object::Handle(
       DartEntry::InvokeDynamic(receiver,
                                function,
                                invoke_arguments,
                                kNoArgumentNames));
   CheckResultError(result);
   arguments.SetReturn(result);
 }
 
 
@@ skipping 492 matching lines @@
     intptr_t line, column;
     script.GetTokenLocation(token_pos, &line, &column);
     String& line_string = String::Handle(script.GetLine(line));
     OS::Print("  Function: %s\n", top_function.ToFullyQualifiedCString());
     OS::Print("  Line %"Pd": '%s'\n", line, line_string.ToCString());
   }
 }
 
 
 }  // namespace dart