*** old/src/share/vm/opto/output.cpp	Mon May  5 12:29:56 2014
--- new/src/share/vm/opto/output.cpp	Mon May  5 12:29:55 2014

*** 364,375 ****
--- 364,375 ----
    // relative jmp_offset and reloc_size information.  The second performs
    // short branch substitution using the pessimistic sizing.  The
    // third inserts nops where needed.
  
    // Step one, perform a pessimistic sizing pass.
!   uint last_call_adr = max_uint;
!   uint last_avoid_back_to_back_adr = max_uint;
!   uint last_call_adr = (uint) -1;
!   uint last_avoid_back_to_back_adr = (uint) -1;
    uint nop_size = (new (this) MachNopNode())->size(_regalloc);
    for (uint i = 0; i < nblocks; i++) { // For all blocks
      Block* block = _cfg->get_block(i);
  
      // During short branch replacement, we store the relative (to blk_starts)

*** 477,487 ****
--- 477,487 ----
      blk_starts[i+1] = blk_starts[i]+blk_size;
    }
  
    // Step two, replace eligible long jumps.
    bool progress = true;
!   uint last_may_be_short_branch_adr = max_uint;
!   uint last_may_be_short_branch_adr = (uint) -1;
    while (has_short_branch_candidate && progress) {
      progress = false;
      has_short_branch_candidate = false;
      int adjust_block_start = 0;
      for (uint i = 0; i < nblocks; i++) {