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

runtime/vm/assembler_arm64.cc

 // Copyright (c) 2014, 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_ARM64)
 
 #include "vm/assembler.h"
 #include "vm/cpu.h"
 #include "vm/longjump.h"
@@ skipping 1152 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()), 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);
 }
 
 
 // Frame entry and exit.
 void Assembler::ReserveAlignedFrameSpace(intptr_t frame_space) {
   // Reserve space for arguments and align frame before entering
   // the C++ world.
   if (frame_space != 0) {
     AddImmediate(SP, SP, -frame_space, kNoPP);
   }
@@ skipping 369 matching lines @@
     add(base, array, Operand(index, LSL, shift));
   }
   const OperandSize size = Address::OperandSizeFor(cid);
   ASSERT(Address::CanHoldOffset(offset, Address::Offset, size));
   return Address(base, offset, Address::Offset, size);
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_ARM64