changeset 1839:a8562b41bd76 hs20-b01 jdk7-b112

Merge
author trims
date Thu, 30 Sep 2010 20:41:35 -0700
parents 86e1e9c98de8 (current diff) 5511edd5d719 (diff)
children 91b5d487fbee
files src/cpu/x86/vm/c1_LIRAssembler_x86.cpp
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp	Fri Sep 24 00:56:19 2010 -0700
+++ b/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp	Thu Sep 30 20:41:35 2010 -0700
@@ -1617,8 +1617,7 @@
 void LIR_Assembler::type_profile_helper(Register mdo,
                                         ciMethodData *md, ciProfileData *data,
                                         Register recv, Label* update_done) {
-  uint i;
-  for (i = 0; i < ReceiverTypeData::row_limit(); i++) {
+  for (uint i = 0; i < ReceiverTypeData::row_limit(); i++) {
     Label next_test;
     // See if the receiver is receiver[n].
     __ cmpptr(recv, Address(mdo, md->byte_offset_of_slot(data, ReceiverTypeData::receiver_offset(i))));
@@ -1630,7 +1629,7 @@
   }
 
   // Didn't find receiver; find next empty slot and fill it in
-  for (i = 0; i < ReceiverTypeData::row_limit(); i++) {
+  for (uint i = 0; i < ReceiverTypeData::row_limit(); i++) {
     Label next_test;
     Address recv_addr(mdo, md->byte_offset_of_slot(data, ReceiverTypeData::receiver_offset(i)));
     __ cmpptr(recv_addr, (intptr_t)NULL_WORD);