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

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 92 matching lines @@
   // List of moves not yet resolved.
   GrowableArray<MoveOperands*> moves_;
 };
 
 
 // Used for describing a deoptimization point after call (lazy deoptimization).
 // For deoptimization before instruction use class CompilerDeoptInfoWithStub.
 class CompilerDeoptInfo : public ZoneAllocated {
  public:
   CompilerDeoptInfo(intptr_t deopt_id,
-                    DeoptReasonId reason,
+                    ICData::DeoptReasonId reason,
                     Environment* deopt_env)
       : pc_offset_(-1),
         deopt_id_(deopt_id),
         reason_(reason),
         deopt_env_(deopt_env) {
     ASSERT(deopt_env != NULL);
   }
 
   RawDeoptInfo* CreateDeoptInfo(FlowGraphCompiler* compiler,
                                 DeoptInfoBuilder* builder,
                                 const Array& deopt_table);
 
 
   // No code needs to be generated.
   virtual void GenerateCode(FlowGraphCompiler* compiler, intptr_t stub_ix) {}
 
   intptr_t pc_offset() const { return pc_offset_; }
   void set_pc_offset(intptr_t offset) { pc_offset_ = offset; }
 
   intptr_t deopt_id() const { return deopt_id_; }
-  DeoptReasonId reason() const { return reason_; }
+  ICData::DeoptReasonId reason() const { return reason_; }
   const Environment* deopt_env() const { return deopt_env_; }
 
  private:
   void EmitMaterializations(Environment* env, DeoptInfoBuilder* builder);
 
   void AllocateIncomingParametersRecursive(Environment* env,
                                            intptr_t* stack_height);
 
   intptr_t pc_offset_;
   const intptr_t deopt_id_;
-  const DeoptReasonId reason_;
+  const ICData::DeoptReasonId reason_;
   Environment* deopt_env_;
 
   DISALLOW_COPY_AND_ASSIGN(CompilerDeoptInfo);
 };
 
 
 class CompilerDeoptInfoWithStub : public CompilerDeoptInfo {
  public:
   CompilerDeoptInfoWithStub(intptr_t deopt_id,
-                            DeoptReasonId reason,
+                            ICData::DeoptReasonId reason,
                             Environment* deopt_env)
       : CompilerDeoptInfo(deopt_id, reason, deopt_env), entry_label_() {
-    ASSERT(reason != kDeoptAtCall);
+    ASSERT(reason != ICData::kDeoptAtCall);
   }
 
   Label* entry_label() { return &entry_label_; }
 
   // Implementation is in architecture specific file.
   virtual void GenerateCode(FlowGraphCompiler* compiler, intptr_t stub_ix);
 
  private:
   Label entry_label_;
 
@@ skipping 238 matching lines @@
                            intptr_t pc_offset,
                            const Array& handler_types,
                            bool needs_stacktrace);
   void SetNeedsStacktrace(intptr_t try_index);
   void AddCurrentDescriptor(PcDescriptors::Kind kind,
                             intptr_t deopt_id,
                             intptr_t token_pos);
 
   void RecordSafepoint(LocationSummary* locs);
 
-  Label* AddDeoptStub(intptr_t deopt_id, DeoptReasonId reason);
+  Label* AddDeoptStub(intptr_t deopt_id, ICData::DeoptReasonId reason);
 
   void AddDeoptIndexAtCall(intptr_t deopt_id, intptr_t token_pos);
 
   void AddSlowPathCode(SlowPathCode* slow_path);
 
   void FinalizeExceptionHandlers(const Code& code);
   void FinalizePcDescriptors(const Code& code);
   void FinalizeDeoptInfo(const Code& code);
   void FinalizeStackmaps(const Code& code);
   void FinalizeVarDescriptors(const Code& code);
@@ skipping 177 matching lines @@
   // that should be used when deoptimizing we store it in this variable.
   // In future AddDeoptStub should be moved out of the instruction template.
   Environment* pending_deoptimization_env_;
 
   DISALLOW_COPY_AND_ASSIGN(FlowGraphCompiler);
 };
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_COMPILER_H_