src/share/vm/opto/output.cpp

*** 524,534 ****
          if (needs_padding && offset <= 0)
            offset -= nop_size;
  
          if (_matcher->is_short_branch_offset(mach->rule(), br_size, offset)) {
            // We've got a winner.  Replace this branch.
!           MachNode* replacement = mach->as_MachBranch()->short_branch_version(this);
  
            // Update the jmp_size.
            int new_size = replacement->size(_regalloc);
            int diff     = br_size - new_size;
            assert(diff >= (int)nop_size, "short_branch size should be smaller");
--- 524,534 ----
          if (needs_padding && offset <= 0)
            offset -= nop_size;
  
          if (_matcher->is_short_branch_offset(mach->rule(), br_size, offset)) {
            // We've got a winner.  Replace this branch.
!           MachNode* replacement = mach->as_MachBranch()->short_branch_version();
  
            // Update the jmp_size.
            int new_size = replacement->size(_regalloc);
            int diff     = br_size - new_size;
            assert(diff >= (int)nop_size, "short_branch size should be smaller");
*** 1172,1182 ****
    cb->initialize_stubs_size(stub_req);
    cb->initialize_oop_recorder(env()->oop_recorder());
  
    // fill in the nop array for bundling computations
    MachNode *_nop_list[Bundle::_nop_count];
!   Bundle::initialize_nops(_nop_list, this);
  
    return cb;
  }
  
  //------------------------------fill_buffer------------------------------------
--- 1172,1182 ----
    cb->initialize_stubs_size(stub_req);
    cb->initialize_oop_recorder(env()->oop_recorder());
  
    // fill in the nop array for bundling computations
    MachNode *_nop_list[Bundle::_nop_count];
!   Bundle::initialize_nops(_nop_list);
  
    return cb;
  }
  
  //------------------------------fill_buffer------------------------------------
*** 1406,1416 ****
              if (needs_padding && offset <= 0)
                offset -= nop_size;
  
              if (_matcher->is_short_branch_offset(mach->rule(), br_size, offset)) {
                // We've got a winner.  Replace this branch.
!               MachNode* replacement = mach->as_MachBranch()->short_branch_version(this);
  
                // Update the jmp_size.
                int new_size = replacement->size(_regalloc);
                assert((br_size - new_size) >= (int)nop_size, "short_branch size should be smaller");
                // Insert padding between avoid_back_to_back branches.
--- 1406,1416 ----
              if (needs_padding && offset <= 0)
                offset -= nop_size;
  
              if (_matcher->is_short_branch_offset(mach->rule(), br_size, offset)) {
                // We've got a winner.  Replace this branch.
!               MachNode* replacement = mach->as_MachBranch()->short_branch_version();
  
                // Update the jmp_size.
                int new_size = replacement->size(_regalloc);
                assert((br_size - new_size) >= (int)nop_size, "short_branch size should be smaller");
                // Insert padding between avoid_back_to_back branches.