VM: Clean up generated code for NoSuchMethod invocation of closures.

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 "vm/ast_printer.h"
@@ skipping 900 matching lines @@
       __ 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);
   if (function.IsClosureFunction()) {
-    // Invoke noSuchMethod function passing "call" as the original name.
-    StubCode* stub_code = isolate()->stub_code();
-    const int kNumArgsChecked = 1;
-    const ICData& ic_data = ICData::ZoneHandle(
-        ICData::New(function, Symbols::Call(), Object::empty_array(),
-                    Isolate::kNoDeoptId, kNumArgsChecked));
-    __ LoadObject(ECX, ic_data);
     __ LeaveFrame();  // The arguments are still on the stack.
-    __ jmp(&stub_code->CallNoSuchMethodFunctionLabel());
+    __ jmp(&isolate()->stub_code()->CallClosureNoSuchMethodLabel());
     // 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.
@@ skipping 114 matching lines @@
       __ movl(EAX, FieldAddress(EDX, ArgumentsDescriptor::count_offset()));
       __ cmpl(EAX, Immediate(Smi::RawValue(num_fixed_params)));
       __ j(NOT_EQUAL, &wrong_num_arguments, Assembler::kNearJump);
       __ cmpl(EAX,
               FieldAddress(EDX,
                            ArgumentsDescriptor::positional_count_offset()));
       __ j(EQUAL, &correct_num_arguments, Assembler::kNearJump);
 
       __ Bind(&wrong_num_arguments);
       if (function.IsClosureFunction()) {
-        // Invoke noSuchMethod function passing the original function name.
-        // For closure functions, 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::empty_array(),
-                        Isolate::kNoDeoptId, kNumArgsChecked));
-        __ LoadObject(ECX, ic_data);
         __ LeaveFrame();  // The arguments are still on the stack.
-        __ jmp(&stub_code->CallNoSuchMethodFunctionLabel());
+        __ jmp(&stub_code->CallClosureNoSuchMethodLabel());
         // The noSuchMethod call may return to the caller, but not here.
-        __ int3();
       } else {
         __ Stop("Wrong number of arguments");
       }
       __ Bind(&correct_num_arguments);
     }
   } else if (!flow_graph().IsCompiledForOsr()) {
     CopyParameters();
   }
 
   // In unoptimized code, initialize (non-argument) stack allocated slots to
@@ skipping 682 matching lines @@
   __ movups(reg, Address(ESP, 0));
   __ addl(ESP, Immediate(kFpuRegisterSize));
 }
 
 
 #undef __
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32