Generalize bounds checks.

runtime/vm/deopt_instructions.h

 // 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.
 
 #ifndef VM_DEOPT_INSTRUCTIONS_H_
 #define VM_DEOPT_INSTRUCTIONS_H_
 
 #include "vm/allocation.h"
 #include "vm/assembler.h"
 #include "vm/code_generator.h"
@@ skipping 74 matching lines @@
   }
 
   Isolate* isolate() const { return isolate_; }
 
   intptr_t source_frame_size() const { return source_frame_size_; }
   intptr_t dest_frame_size() const { return dest_frame_size_; }
 
   RawCode* code() const { return code_; }
 
   ICData::DeoptReasonId deopt_reason() const { return deopt_reason_; }
+  bool HasDeoptFlag(ICData::DeoptFlags flag) {
+    return (deopt_flags_ & flag) != 0;
+  }
 
   RawDeoptInfo* deopt_info() const { return deopt_info_; }
 
   // Fills the destination frame but defers materialization of
   // objects.
   void FillDestFrame();
 
   // Materializes all deferred objects.  Returns the total number of
   // artificial arguments used during deoptimization.
   intptr_t MaterializeDeferredObjects();
@@ skipping 79 matching lines @@
   bool dest_frame_is_allocated_;
   intptr_t* dest_frame_;
   intptr_t dest_frame_size_;
   bool source_frame_is_allocated_;
   intptr_t* source_frame_;
   intptr_t source_frame_size_;
   intptr_t* cpu_registers_;
   fpu_register_t* fpu_registers_;
   intptr_t num_args_;
   ICData::DeoptReasonId deopt_reason_;
+  uint32_t deopt_flags_;
   intptr_t caller_fp_;
   Isolate* isolate_;
 
   DeferredSlot* deferred_slots_;
 
   intptr_t deferred_objects_count_;
   DeferredObject** deferred_objects_;
 
   DISALLOW_COPY_AND_ASSIGN(DeoptContext);
 };
@@ skipping 275 matching lines @@
 class DeoptTable : public AllStatic {
  public:
   // Return the array size in elements for a given number of table entries.
   static intptr_t SizeFor(intptr_t length);
 
   // Set the entry at the given index into the table (not an array index).
   static void SetEntry(const Array& table,
                        intptr_t index,
                        const Smi& offset,
                        const DeoptInfo& info,
-                       const Smi& reason);
+                       const Smi& reason_and_flags);
 
   // Return the length of the table in entries.
   static intptr_t GetLength(const Array& table);
 
   // Set the output parameters (offset, info, reason) to the entry values at
   // the index into the table (not an array index).
   static void GetEntry(const Array& table,
                        intptr_t index,
                        Smi* offset,
                        DeoptInfo* info,
-                       Smi* reason);
+                       Smi* reason_and_flags);
+
+  static RawSmi* EncodeReasonAndFlags(ICData::DeoptReasonId reason,
+                                      uint32_t flags) {
+    return Smi::New(ReasonField::encode(reason) |
+                    FlagsField::encode(flags));
+  }
+
+  class ReasonField : public BitField<ICData::DeoptReasonId, 0, 8> { };
+  class FlagsField : public BitField<uint32_t, 8, 8> { };
 
  private:
   static const intptr_t kEntrySize = 3;
 };
 
 }  // namespace dart
 
 #endif  // VM_DEOPT_INSTRUCTIONS_H_