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

runtime/vm/deopt_instructions.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/deopt_instructions.h"
 
 #include "vm/assembler.h"
 #include "vm/code_patcher.h"
 #include "vm/intermediate_language.h"
 #include "vm/locations.h"
@@ skipping 26 matching lines @@
       fpu_registers_(fpu_registers),
       num_args_(0),
       deopt_reason_(kDeoptUnknown),
       isolate_(Isolate::Current()),
       deferred_boxes_(NULL),
       deferred_object_refs_(NULL),
       deferred_objects_count_(0),
       deferred_objects_(NULL) {
   object_table_ = code.object_table();
 
-  intptr_t deopt_reason = kDeoptUnknown;
+  DeoptReasonId deopt_reason = kDeoptUnknown;
   const DeoptInfo& deopt_info =
       DeoptInfo::Handle(code.GetDeoptInfoAtPc(frame->pc(), &deopt_reason));
   ASSERT(!deopt_info.IsNull());
   deopt_info_ = deopt_info.raw();
-  deopt_reason_ = static_cast<DeoptReasonId>(deopt_reason);
+  deopt_reason_ = deopt_reason;
 
   const Function& function = Function::Handle(code.function());
 
   // Do not include incoming arguments if there are optional arguments
   // (they are copied into local space at method entry).
   num_args_ =
       function.HasOptionalParameters() ? 0 : function.num_fixed_parameters();
 
   // The fixed size section of the (fake) Dart frame called via a stub by the
   // optimized function contains FP, PP (ARM and MIPS only), PC-marker and
@@ skipping 26 matching lines @@
     dest_frame_ = new intptr_t[dest_frame_size_];
     ASSERT(source_frame_ != NULL);
     for (intptr_t i = 0; i < dest_frame_size_; i++) {
       dest_frame_[i] = 0;
     }
     dest_frame_is_allocated_ = true;
   }
 
   if (FLAG_trace_deoptimization || FLAG_trace_deoptimization_verbose) {
     OS::PrintErr(
-        "Deoptimizing (reason %" Pd " '%s') at pc %#" Px " '%s' (count %d)\n",
+        "Deoptimizing (reason %d '%s') at pc %#" Px " '%s' (count %d)\n",
         deopt_reason,
         DeoptReasonToText(deopt_reason_),
         frame->pc(),
         function.ToFullyQualifiedCString(),
         function.deoptimization_counter());
   }
 }
 
 
 DeoptContext::~DeoptContext() {
@@ skipping 498 matching lines @@
     ASSERT(continue_at_pc != 0);
     *dest_addr = continue_at_pc;
 
     uword pc = code.GetPcForDeoptId(deopt_id_, PcDescriptors::kIcCall);
     if (pc != 0) {
       // If the deoptimization happened at an IC call, update the IC data
       // to avoid repeated deoptimization at the same site next time around.
       ICData& ic_data = ICData::Handle();
       CodePatcher::GetInstanceCallAt(pc, code, &ic_data);
       if (!ic_data.IsNull()) {
-        ic_data.set_deopt_reason(deopt_context->deopt_reason());
+        ic_data.AddDeoptReason(deopt_context->deopt_reason());
       }
     } else if (deopt_context->deopt_reason() == kDeoptHoistedCheckClass) {
       // Prevent excessive deoptimization.
       Function::Handle(code.function()).set_allows_hoisting_check_class(false);
     }
   }
 
   intptr_t object_table_index() const { return object_table_index_; }
   intptr_t deopt_id() const { return deopt_id_; }
 
@@ skipping 848 matching lines @@
                           Smi* offset,
                           DeoptInfo* info,
                           Smi* reason) {
   intptr_t i = index * kEntrySize;
   *offset ^= table.At(i);
   *info ^= table.At(i + 1);
   *reason ^= table.At(i + 2);
 }
 
 }  // namespace dart