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

runtime/vm/assembler_arm64.cc

Index: runtime/vm/assembler_arm64.cc
diff --git a/runtime/vm/assembler_arm64.cc b/runtime/vm/assembler_arm64.cc
index 59bf68817bbab3347f6114f6184ddc245ba00836..d56cb3c714426f9db0c16dee2bd763d843ee353e 100644
--- a/runtime/vm/assembler_arm64.cc
+++ b/runtime/vm/assembler_arm64.cc
@@ -1170,11 +1170,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()), kWord);
+  ldr(scratch2, FieldAddress(ic_data, ICData::state_bits_offset()), kWord);
   orrw(scratch2,
        scratch2,
-       Operand(scratch1, LSL, ICData::kBitsPerRangeFeedback * index));
-  str(scratch2, FieldAddress(ic_data, ICData::range_feedback_offset()), kWord);
+       Operand(scratch1, LSL, ICData::RangeFeedbackShift(index)));
+  str(scratch2, FieldAddress(ic_data, ICData::state_bits_offset()), kWord);
 }