Merge RawICData::range_feedback_ field into RawICData::state_bits_.

runtime/vm/object.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_OBJECT_H_
 #define VM_OBJECT_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/utils.h"
@@ skipping 3529 matching lines @@
   RawArray* arguments_descriptor() const {
     return raw_ptr()->args_descriptor_;
   }
 
   intptr_t NumArgsTested() const;
 
   intptr_t deopt_id() const {
     return raw_ptr()->deopt_id_;
   }
 
-  uint32_t range_feedback() const {
-    return raw_ptr()->range_feedback_;
-  }
-
+  // Note: only deopts with reasons below kUnknown in this list are recorded in

[zra, 2014/12/15 20:57:38]

"below" could be a little confusing. I first read it as meaning "after Unknown
in the following list". Maybe change to "before Unknown in following list," or
"with values less than kUnknown."

+  // the ICData. All other reasons are used purely for printing informational
+  // messages printed during deoptimization itself.
   #define DEOPT_REASONS(V)                                                     \
+    V(BinarySmiOp)                                                             \
+    V(BinaryMintOp)                                                            \
+    V(DoubleToSmi)                                                             \
     V(Unknown)                                                                 \
     V(InstanceGetter)                                                          \
     V(PolymorphicInstanceCallTestFail)                                         \
     V(InstanceCallNoICData)                                                    \
     V(IntegerToDouble)                                                         \
-    V(BinarySmiOp)                                                             \
-    V(BinaryMintOp)                                                            \
     V(UnaryMintOp)                                                             \
-    V(ShiftMintOp)                                                             \
     V(BinaryDoubleOp)                                                          \
     V(InstanceSetter)                                                          \
     V(Equality)                                                                \
     V(RelationalOp)                                                            \
     V(EqualityClassCheck)                                                      \
     V(NoTypeFeedback)                                                          \
     V(UnaryOp)                                                                 \
     V(UnboxInteger)                                                            \
     V(CheckClass)                                                              \
     V(CheckSmi)                                                                \
     V(CheckArrayBound)                                                         \
     V(AtCall)                                                                  \
-    V(DoubleToSmi)                                                             \
     V(Int32Load)                                                               \
     V(Uint32Load)                                                              \
     V(GuardField)                                                              \
     V(TestCids)                                                                \
     V(NumReasons)                                                              \
 
   enum DeoptReasonId {
   #define DEFINE_ENUM_LIST(name) kDeopt##name,
   DEOPT_REASONS(DEFINE_ENUM_LIST)
   #undef DEFINE_ENUM_LIST
   };
 
+  enum {
+    kLastRecordedDeoptReason = kDeoptUnknown - 1
+  };
+
   enum DeoptFlags {
     // Deoptimization is caused by an optimistically hoisted instruction.
     kHoisted = 1 << 0,
 
     // Deoptimization is caused by an optimistically generalized bounds check.
     kGeneralized = 1 << 1
   };
 
   bool HasDeoptReasons() const { return DeoptReasons() != 0; }
   uint32_t DeoptReasons() const;
@@ skipping 39 matching lines @@
   }
 
   static intptr_t ic_data_offset() {
     return OFFSET_OF(RawICData, ic_data_);
   }
 
   static intptr_t owner_offset() {
     return OFFSET_OF(RawICData, owner_);
   }
 
-  static intptr_t range_feedback_offset() {
-    return OFFSET_OF(RawICData, range_feedback_);
-  }
-
   // Used for unoptimized static calls when no class-ids are checked.
   void AddTarget(const Function& target) const;
 
   // Adding checks.
 
   // Adds one more class test to ICData. Length of 'classes' must be equal to
   // the number of arguments tested. Use only for num_args_tested > 1.
   void AddCheck(const GrowableArray<intptr_t>& class_ids,
                 const Function& target) const;
   // Adds sorted so that Smi is the first class-id. Use only for
@@ skipping 87 matching lines @@
   //   - usmi   0000 [used only on 32bit platforms]
   //   - smi    0001
   //   - uint31 0010
   //   - int32  0011
   //   - uint32 0100
   //   - int33  x1x1
   //   - int64  1xxx
   //
   // DecodeRangeFeedbackAt() helper maps these states into the RangeFeedback
   // enumeration.
-  enum RangeFeedbackBits {
+  enum RangeFeedbackLatticeBits {
     kSignedRangeBit = 1 << 0,
     kInt32RangeBit = 1 << 1,
     kUint32RangeBit = 1 << 2,
     kInt64RangeBit = 1 << 3,
     kBitsPerRangeFeedback = 4,
-    kRangeFeedbackMask = (1 << kBitsPerRangeFeedback) - 1
+    kRangeFeedbackMask = (1 << kBitsPerRangeFeedback) - 1,
+    kRangeFeedbackSlots = 3
   };
 
   static bool IsValidRangeFeedbackIndex(intptr_t index) {
-    return (0 <= index) && (index < 3);
+    return (0 <= index) && (index < kRangeFeedbackSlots);
+  }
+
+  static intptr_t RangeFeedbackShift(intptr_t index) {
+    return (index * kBitsPerRangeFeedback) + kRangeFeedbackPos;
   }
 
   static const char* RangeFeedbackToString(RangeFeedback feedback) {
     switch (feedback) {
       case kSmiRange:
         return "smi";
       case kInt32Range:
         return "int32";
       case kUint32Range:
         return "uint32";
@@ skipping 15 matching lines @@
     return raw_ptr()->ic_data_;
   }
 
   void set_owner(const Function& value) const;
   void set_target_name(const String& value) const;
   void set_arguments_descriptor(const Array& value) const;
   void set_deopt_id(intptr_t value) const;
   void SetNumArgsTested(intptr_t value) const;
   void set_ic_data(const Array& value) const;
   void set_state_bits(uint32_t bits) const;
-  void set_range_feedback(uint32_t feedback);
 
   enum {
     kNumArgsTestedPos = 0,
     kNumArgsTestedSize = 2,
     kDeoptReasonPos = kNumArgsTestedPos + kNumArgsTestedSize,
-    kDeoptReasonSize = kDeoptNumReasons,
+    kDeoptReasonSize = kLastRecordedDeoptReason + 1,
     kIssuedJSWarningBit = kDeoptReasonPos + kDeoptReasonSize,
+    kRangeFeedbackPos = kIssuedJSWarningBit + 1,
+    kRangeFeedbackSize = kBitsPerRangeFeedback * kRangeFeedbackSlots
   };
 
   class NumArgsTestedBits : public BitField<uint32_t,
       kNumArgsTestedPos, kNumArgsTestedSize> {};  // NOLINT
   class DeoptReasonBits : public BitField<uint32_t,
       ICData::kDeoptReasonPos, ICData::kDeoptReasonSize> {};  // NOLINT
   class IssuedJSWarningBit : public BitField<bool, kIssuedJSWarningBit, 1> {};
+  class RangeFeedbackBits : public BitField<uint32_t,
+      ICData::kRangeFeedbackPos, ICData::kRangeFeedbackSize> {};  // NOLINT
 
 #if defined(DEBUG)
   // Used in asserts to verify that a check is not added twice.
   bool HasCheck(const GrowableArray<intptr_t>& cids) const;
 #endif  // DEBUG
 
   intptr_t TestEntryLength() const;
   void WriteSentinel(const Array& data) const;
 
   FINAL_HEAP_OBJECT_IMPLEMENTATION(ICData, Object);
@@ skipping 3838 matching lines @@
 
 
 RawObject* MegamorphicCache::GetTargetFunction(const Array& array,
                                                intptr_t index) {
   return array.At((index * kEntryLength) + kTargetFunctionIndex);
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_