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

runtime/vm/assembler_arm.cc

 // 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.
 
 #include "vm/globals.h"  // NOLINT
 #if defined(TARGET_ARCH_ARM)
 
 #include "vm/assembler.h"
 #include "vm/cpu.h"
 #include "vm/longjump.h"
@@ skipping 1949 matching lines @@
 
 
 void Assembler::UpdateRangeFeedback(Register value,
                                     intptr_t index,
                                     Register ic_data,
                                     Register scratch1,
                                     Register scratch2,
                                     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()));
 }
 
 
 static bool CanEncodeBranchOffset(int32_t offset) {
   ASSERT(Utils::IsAligned(offset, 4));
   return Utils::IsInt(Utils::CountOneBits(kBranchOffsetMask), offset);
 }
 
 
 int32_t Assembler::EncodeBranchOffset(int32_t offset, int32_t inst) {
@@ skipping 1636 matching lines @@
 
 
 const char* Assembler::FpuRegisterName(FpuRegister reg) {
   ASSERT((0 <= reg) && (reg < kNumberOfFpuRegisters));
   return fpu_reg_names[reg];
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_ARM