Store arguments descriptor in ICData. Remove loading of arguments descriptor at unoptimized call si…

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 990 matching lines @@
   // The call below has an empty stackmap because we have just
   // dropped the spill slots.
   BitmapBuilder* empty_stack_bitmap = new BitmapBuilder();
 
   // 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, Isolate::kNoDeoptId, kNumArgsChecked));
+      ICData::New(function, name, Object::null_array(),
+                  Isolate::kNoDeoptId, kNumArgsChecked));
   __ LoadObject(ECX, ic_data);
   // EBP - 4 : PC marker, allows easy identification of RawInstruction obj.
   // 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 : ic-data.
   // EDX : arguments descriptor array.
   __ call(&StubCode::CallNoSuchMethodFunctionLabel());
   // Emit descriptors in order to provide correct postion in stacktrace.
@@ skipping 149 matching lines @@
           // that area on the stack.
           __ addl(ESP, Immediate(StackSize() * kWordSize));
         }
         // The call below has an empty stackmap because we have just
         // dropped the spill slots.
         BitmapBuilder* empty_stack_bitmap = new BitmapBuilder();
 
         // Invoke noSuchMethod function passing "call" as the function name.
         const int kNumArgsChecked = 1;
         const ICData& ic_data = ICData::ZoneHandle(
-            ICData::New(function, Symbols::Call(),
+            ICData::New(function, Symbols::Call(), Object::null_array(),
                         Isolate::kNoDeoptId, kNumArgsChecked));
         __ LoadObject(ECX, ic_data);
         // EBP - 4 : PC marker, for easy identification of RawInstruction obj.
         // 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 : ic-data.
         // EDX : arguments descriptor array.
         __ call(&StubCode::CallNoSuchMethodFunctionLabel());
@@ skipping 121 matching lines @@
       // arguments are removed.
       AddCurrentDescriptor(PcDescriptors::kDeopt, deopt_id_after, token_pos);
     }
   }
 }
 
 
 void FlowGraphCompiler::EmitOptimizedInstanceCall(
     ExternalLabel* target_label,
     const ICData& ic_data,
-    const Array& arguments_descriptor,
     intptr_t argument_count,
     intptr_t deopt_id,
     intptr_t token_pos,
     LocationSummary* locs) {
   // Each ICData propagated from unoptimized to optimized code contains the
   // function that corresponds to the Dart function of that IC call. Due
   // to inlining in optimized code, that function may not correspond to the
   // top-level function (parsed_function().function()) which could be
   // reoptimized and which counter needs to be incremented.
   // Pass the function explicitly, it is used in IC stub.
   __ LoadObject(EDI, parsed_function().function());
   __ LoadObject(ECX, ic_data);
-  __ LoadObject(EDX, arguments_descriptor);
   GenerateDartCall(deopt_id,
                    token_pos,
                    target_label,
                    PcDescriptors::kIcCall,
                    locs);
   __ Drop(argument_count);
 }
 
 
 void FlowGraphCompiler::EmitInstanceCall(ExternalLabel* target_label,
                                          const ICData& ic_data,
-                                         const Array& arguments_descriptor,
                                          intptr_t argument_count,
                                          intptr_t deopt_id,
                                          intptr_t token_pos,
                                          LocationSummary* locs) {
   __ LoadObject(ECX, ic_data);
-  __ LoadObject(EDX, arguments_descriptor);
   GenerateDartCall(deopt_id,
                    token_pos,
                    target_label,
                    PcDescriptors::kIcCall,
                    locs);
   __ Drop(argument_count);
 }
 
 
 void FlowGraphCompiler::EmitMegamorphicInstanceCall(
     const ICData& ic_data,
-    const Array& arguments_descriptor,
     intptr_t argument_count,
     intptr_t deopt_id,
     intptr_t token_pos,
     LocationSummary* locs) {
   MegamorphicCacheTable* table = Isolate::Current()->megamorphic_cache_table();
   const String& name = String::Handle(ic_data.target_name());
+  const Array& arguments_descriptor =
+      Array::ZoneHandle(ic_data.arguments_descriptor());
+  ASSERT(!arguments_descriptor.IsNull());
   const MegamorphicCache& cache =
       MegamorphicCache::ZoneHandle(table->Lookup(name, arguments_descriptor));
   Label not_smi, load_cache;
   __ movl(EAX, Address(ESP, (argument_count - 1) * kWordSize));
   __ testl(EAX, Immediate(kSmiTagMask));
   __ j(NOT_ZERO, &not_smi, Assembler::kNearJump);
   __ movl(EAX, Immediate(Smi::RawValue(kSmiCid)));
   __ jmp(&load_cache);
 
   __ Bind(&not_smi);
@@ skipping 542 matching lines @@
   __ movups(reg, Address(ESP, 0));
   __ addl(ESP, Immediate(kFpuRegisterSize));
 }
 
 
 #undef __
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32