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

runtime/vm/assembler_mips.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_MIPS)
 
 #include "vm/assembler.h"
 #include "vm/longjump.h"
 #include "vm/runtime_entry.h"
@@ skipping 720 matching lines @@
 }
 
 
 void Assembler::UpdateRangeFeedback(Register value,
                                     intptr_t index,
                                     Register ic_data,
                                     Register scratch,
                                     Label* miss) {
   ASSERT(ICData::IsValidRangeFeedbackIndex(index));
   ComputeRange(scratch, value, miss);
-  LoadFieldFromOffset(TMP, ic_data, ICData::range_feedback_offset());
-  if (index != 0) {
-    sll(scratch, scratch, ICData::kBitsPerRangeFeedback * index);
-  }
+  LoadFieldFromOffset(TMP, ic_data, ICData::state_bits_offset());
+  sll(scratch, scratch, ICData::RangeFeedbackShift(index));
   or_(TMP, TMP, scratch);
-  StoreFieldToOffset(TMP, ic_data, ICData::range_feedback_offset());
+  StoreFieldToOffset(TMP, ic_data, ICData::state_bits_offset());
 }
 
 
 void Assembler::EnterFrame() {
   ASSERT(!in_delay_slot_);
   addiu(SP, SP, Immediate(-2 * kWordSize));
   sw(RA, Address(SP, 1 * kWordSize));
   sw(FP, Address(SP, 0 * kWordSize));
   mov(FP, SP);
 }
@@ skipping 516 matching lines @@
     Emit(reinterpret_cast<int32_t>(message));
     Bind(&msg);
     break_(Instr::kSimulatorMessageCode);
   }
 #endif
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_MIPS