--- old/src/cpu/sparc/vm/relocInfo_sparc.cpp 2017-04-07 06:27:17.350572907 -0700 +++ new/src/cpu/sparc/vm/relocInfo_sparc.cpp 2017-04-07 06:27:17.187571721 -0700 @@ -93,7 +93,6 @@ case Assembler::branch_op: { -#ifdef _LP64 jint inst2; guarantee(Assembler::inv_op2(inst)==Assembler::sethi_op2, "must be sethi"); if (format() != 0) { @@ -121,17 +120,6 @@ } else { ip->set_data64_sethi( ip->addr_at(0), (intptr_t)x ); } -#else - guarantee(Assembler::inv_op2(inst)==Assembler::sethi_op2, "must be sethi"); - inst &= ~Assembler::hi22( -1); - inst |= Assembler::hi22((intptr_t)x); - // (ignore offset; it doesn't play into the sethi) - if (verify_only) { - guarantee(ip->long_at(0) == inst, "instructions must match"); - } else { - ip->set_long_at(0, inst); - } -#endif } break;