Share ic data between unoptimized and optimized static calls.

runtime/vm/flow_graph_compiler.h

 // 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.
 
 #ifndef VM_FLOW_GRAPH_COMPILER_H_
 #define VM_FLOW_GRAPH_COMPILER_H_
 
 #include "vm/allocation.h"
 #include "vm/assembler.h"
 #include "vm/code_descriptors.h"
@@ skipping 313 matching lines @@
                             intptr_t argument_count,
                             const Array& argument_names,
                             LocationSummary* locs,
                             const ICData& ic_data);
 
   void GenerateStaticCall(intptr_t deopt_id,
                           intptr_t token_pos,
                           const Function& function,
                           intptr_t argument_count,
                           const Array& argument_names,
-                          LocationSummary* locs);
+                          LocationSummary* locs,
+                          const ICData& ic_data);
 
   void GenerateNumberTypeCheck(Register kClassIdReg,
                                const AbstractType& type,
                                Label* is_instance_lbl,
                                Label* is_not_instance_lbl);
   void GenerateStringTypeCheck(Register kClassIdReg,
                                Label* is_instance_lbl,
                                Label* is_not_instance_lbl);
   void GenerateListTypeCheck(Register kClassIdReg,
                              Label* is_instance_lbl);
@@ skipping 123 matching lines @@
   // Emit code to load a Value into register 'dst'.
   void LoadValue(Register dst, Value* value);
 
   void EmitOptimizedStaticCall(const Function& function,
                                const Array& arguments_descriptor,
                                intptr_t argument_count,
                                intptr_t deopt_id,
                                intptr_t token_pos,
                                LocationSummary* locs);
 
-  void EmitUnoptimizedStaticCall(const Function& function,
-                                 const Array& arguments_descriptor,
-                                 intptr_t argument_count,
+  void EmitUnoptimizedStaticCall(intptr_t argument_count,
                                  intptr_t deopt_id,
                                  intptr_t token_pos,
-                                 LocationSummary* locs);
+                                 LocationSummary* locs,
+                                 const ICData& ic_data);
 
   // Type checking helper methods.
   void CheckClassIds(Register class_id_reg,
                      const GrowableArray<intptr_t>& class_ids,
                      Label* is_instance_lbl,
                      Label* is_not_instance_lbl);
 
   RawSubtypeTestCache* GenerateInlineInstanceof(intptr_t token_pos,
                                                 const AbstractType& type,
                                                 Label* is_instance_lbl,
@@ skipping 103 matching lines @@
   intptr_t entry_patch_pc_offset_;
   intptr_t patch_code_pc_offset_;
   intptr_t lazy_deopt_pc_offset_;
 
   DISALLOW_COPY_AND_ASSIGN(FlowGraphCompiler);
 };
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_COMPILER_H_