1.1 --- a/src/share/vm/opto/addnode.cpp Wed Aug 27 09:15:46 2008 -0700 1.2 +++ b/src/share/vm/opto/addnode.cpp Wed Aug 27 14:47:32 2008 -0700 1.3 @@ -573,8 +573,6 @@ 1.4 intptr_t txoffset = Type::OffsetBot; 1.5 if (tx->is_con()) { // Left input is an add of a constant? 1.6 txoffset = tx->get_con(); 1.7 - if (txoffset != (int)txoffset) 1.8 - txoffset = Type::OffsetBot; // oops: add_offset will choke on it 1.9 } 1.10 return tp->add_offset(txoffset); 1.11 } 1.12 @@ -595,8 +593,6 @@ 1.13 intptr_t p2offset = Type::OffsetBot; 1.14 if (p2->is_con()) { // Left input is an add of a constant? 1.15 p2offset = p2->get_con(); 1.16 - if (p2offset != (int)p2offset) 1.17 - p2offset = Type::OffsetBot; // oops: add_offset will choke on it 1.18 } 1.19 return p1->add_offset(p2offset); 1.20 } 1.21 @@ -675,7 +671,7 @@ 1.22 // Check for any interesting operand info. 1.23 // In particular, check for both memory and non-memory operands. 1.24 // %%%%% Clean this up: use xadd_offset 1.25 - int con = opnd->constant(); 1.26 + intptr_t con = opnd->constant(); 1.27 if ( con == TypePtr::OffsetBot ) goto bottom_out; 1.28 offset += con; 1.29 con = opnd->constant_disp();