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

runtime/vm/assembler_arm.cc

Index: runtime/vm/assembler_arm.cc
diff --git a/runtime/vm/assembler_arm.cc b/runtime/vm/assembler_arm.cc
index 6ca3f40fa3193fcad392b1de61aacf08977d57d2..8d1e57f99bb3d3e833198e8fd7e0a00e97c56d6b 100644
--- a/runtime/vm/assembler_arm.cc
+++ b/runtime/vm/assembler_arm.cc
@@ -1967,11 +1967,11 @@ void Assembler::UpdateRangeFeedback(Register value,
                                     Label* miss) {
   ASSERT(ICData::IsValidRangeFeedbackIndex(index));
   ComputeRange(scratch1, value, scratch2, miss);
-  ldr(scratch2, FieldAddress(ic_data, ICData::range_feedback_offset()));
+  ldr(scratch2, FieldAddress(ic_data, ICData::state_bits_offset()));
   orr(scratch2,
       scratch2,
-      Operand(scratch1, LSL, ICData::kBitsPerRangeFeedback * index));
-  str(scratch2, FieldAddress(ic_data, ICData::range_feedback_offset()));
+      Operand(scratch1, LSL, ICData::RangeFeedbackShift(index)));
+  str(scratch2, FieldAddress(ic_data, ICData::state_bits_offset()));
 }