Change resolving of instance methods to check early for name mismatch.

runtime/vm/flow_graph_compiler_ia32.cc

 // Copyright (c) 2013, 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/flow_graph_compiler.h"
 
 #include "lib/error.h"
@@ skipping 881 matching lines @@
   __ movl(EAX, argument_addr);
   __ movl(copy_addr, EAX);
   __ Bind(&loop_condition);
   __ decl(ECX);
   __ j(POSITIVE, &loop, Assembler::kNearJump);
 
   // Copy or initialize optional named arguments.
   const Immediate& raw_null =
       Immediate(reinterpret_cast<intptr_t>(Object::null()));
   Label all_arguments_processed;
+#ifdef DEBUG
+    const bool check_correct_named_args = true;
+#else
+    const bool check_correct_named_args = function.IsClosureFunction();
+#endif
   if (num_opt_named_params > 0) {
     // Start by alphabetically sorting the names of the optional parameters.
     LocalVariable** opt_param = new LocalVariable*[num_opt_named_params];
     int* opt_param_position = new int[num_opt_named_params];
     for (int pos = num_fixed_params; pos < num_params; pos++) {
       LocalVariable* parameter = scope->VariableAt(pos);
       const String& opt_param_name = parameter->name();
       int i = pos - num_fixed_params;
       while (--i >= 0) {
         LocalVariable* param_i = opt_param[i];
@@ skipping 47 matching lines @@
       // Assign EAX to fp[kFirstLocalSlotFromFp - param_pos].
       // We do not use the final allocation index of the variable here, i.e.
       // scope->VariableAt(i)->index(), because captured variables still need
       // to be copied to the context that is not yet allocated.
       const intptr_t computed_param_pos = kFirstLocalSlotFromFp - param_pos;
       const Address param_addr(EBP, computed_param_pos * kWordSize);
       __ movl(param_addr, EAX);
     }
     delete[] opt_param;
     delete[] opt_param_position;
-    // Check that EDI now points to the null terminator in the array descriptor.
-    __ cmpl(Address(EDI, 0), raw_null);
-    __ j(EQUAL, &all_arguments_processed, Assembler::kNearJump);
+    if (check_correct_named_args) {
+      // Check that EDI now points to the null terminator in the arguments
+      // descriptor.
+      __ cmpl(Address(EDI, 0), raw_null);
+      __ j(EQUAL, &all_arguments_processed, Assembler::kNearJump);
+    }
   } else {
     ASSERT(num_opt_pos_params > 0);
     __ movl(ECX,
             FieldAddress(EDX, ArgumentsDescriptor::positional_count_offset()));
     __ SmiUntag(ECX);
     for (int i = 0; i < num_opt_pos_params; i++) {
       Label next_parameter;
       // Handle this optional positional parameter only if k or fewer positional
       // arguments have been passed, where k is param_pos, the position of this
       // optional parameter in the formal parameter list.
       const int param_pos = num_fixed_params + i;
       __ cmpl(ECX, Immediate(param_pos));
       __ j(GREATER, &next_parameter, Assembler::kNearJump);
       // Load EAX with default argument.
       const Object& value = Object::ZoneHandle(
           parsed_function().default_parameter_values().At(i));
       __ LoadObject(EAX, value);
       // Assign EAX to fp[kFirstLocalSlotFromFp - param_pos].
       // We do not use the final allocation index of the variable here, i.e.
       // scope->VariableAt(i)->index(), because captured variables still need
       // to be copied to the context that is not yet allocated.
       const intptr_t computed_param_pos = kFirstLocalSlotFromFp - param_pos;
       const Address param_addr(EBP, computed_param_pos * kWordSize);
       __ movl(param_addr, EAX);
       __ Bind(&next_parameter);
     }
-    __ movl(EBX, FieldAddress(EDX, ArgumentsDescriptor::count_offset()));
-    __ SmiUntag(EBX);
-    // Check that ECX equals EBX, i.e. no named arguments passed.
-    __ cmpl(ECX, EBX);
-    __ j(EQUAL, &all_arguments_processed, Assembler::kNearJump);
+    if (check_correct_named_args) {
+      __ movl(EBX, FieldAddress(EDX, ArgumentsDescriptor::count_offset()));
+      __ SmiUntag(EBX);
+      // Check that ECX equals EBX, i.e. no named arguments passed.
+      __ cmpl(ECX, EBX);
+      __ j(EQUAL, &all_arguments_processed, Assembler::kNearJump);
+    }
   }
 
   __ Bind(&wrong_num_arguments);
-  // Invoke noSuchMethod function passing the original name of the function.
-  // If the function is a closure function, use "call" as the original name.
-  const String& name = String::Handle(
-      function.IsClosureFunction() ? Symbols::Call().raw() : function.name());
-  const int kNumArgsChecked = 1;
-  const ICData& ic_data = ICData::ZoneHandle(
-      ICData::New(function, name, Object::null_array(),
-                  Isolate::kNoDeoptId, kNumArgsChecked));
-  __ LoadObject(ECX, ic_data);
-  __ LeaveFrame();  // The arguments are still on the stack.
-  __ jmp(&StubCode::CallNoSuchMethodFunctionLabel());
-  // The noSuchMethod call may return to the caller, but not here.
-  __ int3();
+  if (function.IsClosureFunction()) {
+    // Invoke noSuchMethod function passing "call" as the original name.
+    const int kNumArgsChecked = 1;
+    const ICData& ic_data = ICData::ZoneHandle(
+        ICData::New(function, Symbols::Call(), Object::null_array(),
+                    Isolate::kNoDeoptId, kNumArgsChecked));
+    __ LoadObject(ECX, ic_data);
+    __ LeaveFrame();  // The arguments are still on the stack.
+    __ jmp(&StubCode::CallNoSuchMethodFunctionLabel());
+    // The noSuchMethod call may return to the caller, but not here.
+    __ int3();
+  } else if (check_correct_named_args) {
+    __ Stop("Wrong arguments");
+  }
 
   __ Bind(&all_arguments_processed);
   // Nullify originally passed arguments only after they have been copied and
   // checked, otherwise noSuchMethod would not see their original values.
   // This step can be skipped in case we decide that formal parameters are
   // implicitly final, since garbage collecting the unmodified value is not
   // an issue anymore.
 
   // EDX : arguments descriptor array.
   __ movl(ECX, FieldAddress(EDX, ArgumentsDescriptor::count_offset()));
@@ skipping 881 matching lines @@
   __ movups(reg, Address(ESP, 0));
   __ addl(ESP, Immediate(kFpuRegisterSize));
 }
 
 
 #undef __
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32