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

runtime/vm/assembler_mips.cc

Index: runtime/vm/assembler_mips.cc
diff --git a/runtime/vm/assembler_mips.cc b/runtime/vm/assembler_mips.cc
index bd061817ac3a1c861062277bc555c1a40636a969..66dbac3a404883de1099d96d0179b14946a3975e 100644
--- a/runtime/vm/assembler_mips.cc
+++ b/runtime/vm/assembler_mips.cc
@@ -738,12 +738,10 @@ void Assembler::UpdateRangeFeedback(Register value,
                                     Label* miss) {
   ASSERT(ICData::IsValidRangeFeedbackIndex(index));
   ComputeRange(scratch, value, miss);
-  LoadFieldFromOffset(TMP, ic_data, ICData::range_feedback_offset());
-  if (index != 0) {
-    sll(scratch, scratch, ICData::kBitsPerRangeFeedback * index);
-  }
+  LoadFieldFromOffset(TMP, ic_data, ICData::state_bits_offset());
+  sll(scratch, scratch, ICData::RangeFeedbackShift(index));
   or_(TMP, TMP, scratch);
-  StoreFieldToOffset(TMP, ic_data, ICData::range_feedback_offset());
+  StoreFieldToOffset(TMP, ic_data, ICData::state_bits_offset());
 }