Remember inside an ICData if it is for a static call or an instance call

runtime/vm/aot_optimizer.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/aot_optimizer.h"
 
 #include "vm/bit_vector.h"
 #include "vm/branch_optimizer.h"
 #include "vm/cha.h"
 #include "vm/compiler.h"
@@ skipping 58 matching lines @@
       if (instr->IsInstanceCall()) {
         InstanceCallInstr* call = instr->AsInstanceCall();
         if (!call->HasICData()) {
           const Array& arguments_descriptor =
               Array::Handle(zone(),
                   ArgumentsDescriptor::New(call->ArgumentCount(),
                                            call->argument_names()));
           const ICData& ic_data = ICData::ZoneHandle(zone(), ICData::New(
               function(), call->function_name(),
               arguments_descriptor, call->deopt_id(),
-              call->checked_argument_count()));
+              call->checked_argument_count(), false));
           call->set_ic_data(&ic_data);
         }
       }
     }
     current_iterator_ = NULL;
   }
 }
 
 
 // Optimize instance calls using cid.  This is called after optimizer
@@ skipping 159 matching lines @@
   const Function& function =
       Function::Handle(Z, ic_data.GetTargetForReceiverClassId(cid));
   // TODO(fschneider): Try looking up the function on the class if it is
   // not found in the ICData.
   if (!function.IsNull()) {
     const ICData& new_ic_data = ICData::ZoneHandle(Z, ICData::New(
         Function::Handle(Z, ic_data.Owner()),
         String::Handle(Z, ic_data.target_name()),
         Object::empty_array(),  // Dummy argument descriptor.
         ic_data.deopt_id(),
-        ic_data.NumArgsTested()));
+        ic_data.NumArgsTested(), false));
     new_ic_data.SetDeoptReasons(ic_data.DeoptReasons());
     new_ic_data.AddReceiverCheck(cid, function);
     return new_ic_data;
   }
 
   return ic_data;
 }
 
 
 static BinarySmiOpInstr* AsSmiShiftLeftInstruction(Definition* d) {
@@ skipping 2170 matching lines @@
               "no overrides of '%s' '%s'\n",
               instr->function_name().ToCString(), receiver_class.ToCString());
         }
 
         // Create fake IC data with the resolved target.
         const ICData& ic_data = ICData::Handle(
             ICData::New(flow_graph_->function(),
                         instr->function_name(),
                         args_desc_array,
                         Thread::kNoDeoptId,
-                        /* args_tested = */ 1));
+                        /* args_tested = */ 1,
+                        false));
         ic_data.AddReceiverCheck(receiver_class.id(), function);
         PolymorphicInstanceCallInstr* call =
             new(Z) PolymorphicInstanceCallInstr(instr, ic_data,
                                                 /* with_checks = */ false,
                                                 /* complete = */ true);
         instr->ReplaceWith(call, current_iterator());
         return;
       }
     }
   }
@@ skipping 52 matching lines @@
             single_target = Function::null();
             break;
           }
 
           // Create an ICData and map all previously seen classes (< i) to
           // the computed single_target.
           ic_data = ICData::New(function,
                                 instr->function_name(),
                                 args_desc_array,
                                 Thread::kNoDeoptId,
-                                /* args_tested = */ 1);
+                                /* args_tested = */ 1, false);
           for (intptr_t j = 0; j < i; j++) {
             ic_data.AddReceiverCheck(class_ids[j], single_target);
           }
 
           single_target = Function::null();
         }
 
         ASSERT(ic_data.raw() != ICData::null());
         ASSERT(single_target.raw() == Function::null());
         ic_data.AddReceiverCheck(cid, target);
@@ skipping 265 matching lines @@
 
   // Discard the environment from the original instruction because the store
   // can't deoptimize.
   instr->RemoveEnvironment();
   ReplaceCall(instr, store);
   return true;
 }
 
 
 }  // namespace dart