Remember all deopt reasons in ic_data, not just the last one.

runtime/vm/flow_graph_compiler.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_XXX.
 
 #include "vm/flow_graph_compiler.h"
 
 #include "vm/cha.h"
 #include "vm/dart_entry.h"
@@ skipping 458 matching lines @@
   ASSERT(Code::kSCallTableCodeEntry == 2);
   static_calls_target_table_.Add(Code::Handle());
 }
 
 
 void FlowGraphCompiler::AddDeoptIndexAtCall(intptr_t deopt_id,
                                             intptr_t token_pos) {
   ASSERT(is_optimizing());
   CompilerDeoptInfo* info =
       new CompilerDeoptInfo(deopt_id,
-                            kDeoptAtCall,
+                            ICData::kDeoptAtCall,
                             pending_deoptimization_env_);
   info->set_pc_offset(assembler()->CodeSize());
   deopt_infos_.Add(info);
 }
 
 
 // This function must be in sync with FlowGraphCompiler::SaveLiveRegisters
 // and FlowGraphCompiler::SlowPathEnvironmentFor.
 void FlowGraphCompiler::RecordSafepoint(LocationSummary* locs) {
   if (is_optimizing()) {
@@ skipping 136 matching lines @@
         def->AsMaterializeObject()->RemapRegisters(fpu_reg_slots,
                                                    cpu_reg_slots);
       }
     }
   }
   return env;
 }
 
 
 Label* FlowGraphCompiler::AddDeoptStub(intptr_t deopt_id,
-                                       DeoptReasonId reason) {
+                                       ICData::DeoptReasonId reason) {
   ASSERT(is_optimizing_);
   CompilerDeoptInfoWithStub* stub =
       new CompilerDeoptInfoWithStub(deopt_id,
                                     reason,
                                     pending_deoptimization_env_);
   deopt_infos_.Add(stub);
   return stub->entry_label();
 }
 
 
@@ skipping 118 matching lines @@
     intptr_t deopt_id,
     intptr_t token_pos,
     intptr_t argument_count,
     const Array& argument_names,
     LocationSummary* locs,
     const ICData& ic_data) {
   ASSERT(!ic_data.IsNull());
   ASSERT(FLAG_propagate_ic_data || (ic_data.NumberOfChecks() == 0));
   uword label_address = 0;
   if (is_optimizing() && (ic_data.NumberOfChecks() == 0)) {
-    if (ic_data.is_closure_call()) {
+    if (ic_data.IsClosureCall()) {
       // This IC call may be closure call only.
       label_address = StubCode::ClosureCallInlineCacheEntryPoint();
       ExternalLabel target_label("InlineCache", label_address);
       EmitInstanceCall(&target_label,
                        ICData::ZoneHandle(ic_data.AsUnaryClassChecks()),
                        argument_count, deopt_id, token_pos, locs);
       return;
     }
     // Emit IC call that will count and thus may need reoptimization at
     // function entry.
     ASSERT(!is_optimizing()
            || may_reoptimize()
            || flow_graph().IsCompiledForOsr());
-    switch (ic_data.num_args_tested()) {
+    switch (ic_data.NumArgsTested()) {
       case 1:
         label_address = StubCode::OneArgOptimizedCheckInlineCacheEntryPoint();
         break;
       case 2:
         label_address = StubCode::TwoArgsOptimizedCheckInlineCacheEntryPoint();
         break;
       case 3:
         label_address =
             StubCode::ThreeArgsOptimizedCheckInlineCacheEntryPoint();
         break;
       default:
         UNIMPLEMENTED();
     }
     ExternalLabel target_label("InlineCache", label_address);
     EmitOptimizedInstanceCall(&target_label, ic_data,
                               argument_count, deopt_id, token_pos, locs);
     return;
   }
 
   if (is_optimizing()) {
     EmitMegamorphicInstanceCall(ic_data, argument_count,
                                 deopt_id, token_pos, locs);
     return;
   }
 
-  switch (ic_data.num_args_tested()) {
+  switch (ic_data.NumArgsTested()) {
     case 1:
       label_address = StubCode::OneArgCheckInlineCacheEntryPoint();
       break;
     case 2:
       label_address = StubCode::TwoArgsCheckInlineCacheEntryPoint();
       break;
     case 3:
       label_address = StubCode::ThreeArgsCheckInlineCacheEntryPoint();
       break;
     default:
@@ skipping 456 matching lines @@
 static int HighestCountFirst(const CidTarget* a, const CidTarget* b) {
   // Negative if 'a' should sort before 'b'.
   return b->count - a->count;
 }
 
 
 // Returns 'sorted' array in decreasing count order.
 // The expected number of elements to sort is less than 10.
 void FlowGraphCompiler::SortICDataByCount(const ICData& ic_data,
                                           GrowableArray<CidTarget>* sorted) {
-  ASSERT(ic_data.num_args_tested() == 1);
+  ASSERT(ic_data.NumArgsTested() == 1);
   const intptr_t len = ic_data.NumberOfChecks();
   sorted->Clear();
 
   for (int i = 0; i < len; i++) {
     sorted->Add(CidTarget(ic_data.GetReceiverClassIdAt(i),
                           &Function::ZoneHandle(ic_data.GetTargetAt(i)),
                           ic_data.GetCountAt(i)));
   }
   sorted->Sort(HighestCountFirst);
 }
 
 }  // namespace dart