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

runtime/vm/assembler_ia32.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_IA32)
 
 #include "vm/assembler.h"
 #include "vm/code_generator.h"
 #include "vm/cpu.h"
@@ skipping 2943 matching lines @@
 
 void Assembler::UpdateRangeFeedback(Register value,
                                     intptr_t index,
                                     Register ic_data,
                                     Register scratch1,
                                     Register scratch2,
                                     Register scratch3,
                                     Label* miss) {
   ASSERT(ICData::IsValidRangeFeedbackIndex(index));
   ComputeRange(scratch1, value, scratch2, scratch3, miss);
-  if (index != 0) {
-    shll(scratch1, Immediate(ICData::kBitsPerRangeFeedback * index));
-  }
-  orl(FieldAddress(ic_data, ICData::range_feedback_offset()), scratch1);
+  shll(scratch1, Immediate(ICData::RangeFeedbackShift(index)));
+  orl(FieldAddress(ic_data, ICData::state_bits_offset()), scratch1);
 }
 
 
 Address Assembler::ElementAddressForIntIndex(bool is_external,
                                              intptr_t cid,
                                              intptr_t index_scale,
                                              Register array,
                                              intptr_t index) {
   if (is_external) {
     return Address(array, index * index_scale);
@@ skipping 58 matching lines @@
 
 const char* Assembler::FpuRegisterName(FpuRegister reg) {
   ASSERT((0 <= reg) && (reg < kNumberOfXmmRegisters));
   return xmm_reg_names[reg];
 }
 
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32