src/share/vm/asm/codeBuffer.cpp

*** 622,632 ****
    return -1;
  }
  
  csize_t CodeBuffer::total_relocation_size() const {
    csize_t total = copy_relocations_to(NULL);  // dry run only
!   return (csize_t) align_size_up(total, HeapWordSize);
  }
  
  csize_t CodeBuffer::copy_relocations_to(address buf, csize_t buf_limit, bool only_inst) const {
    csize_t buf_offset = 0;
    csize_t code_end_so_far = 0;
--- 622,632 ----
    return -1;
  }
  
  csize_t CodeBuffer::total_relocation_size() const {
    csize_t total = copy_relocations_to(NULL);  // dry run only
!   return (csize_t) align_up(total, HeapWordSize);
  }
  
  csize_t CodeBuffer::copy_relocations_to(address buf, csize_t buf_limit, bool only_inst) const {
    csize_t buf_offset = 0;
    csize_t code_end_so_far = 0;
*** 767,777 ****
      const CodeSection* cs = code_section(n);
      if (cs->is_empty())  continue;  // skip trivial section
      CodeSection* dest_cs = dest->code_section(n);
      assert(cs->size() == dest_cs->size(), "sanity");
      csize_t usize = dest_cs->size();
!     csize_t wsize = align_size_up(usize, HeapWordSize);
      assert(dest_cs->start() + wsize <= dest_end, "no overflow");
      // Copy the code as aligned machine words.
      // This may also include an uninitialized partial word at the end.
      Copy::disjoint_words((HeapWord*)cs->start(),
                           (HeapWord*)dest_cs->start(),
--- 767,777 ----
      const CodeSection* cs = code_section(n);
      if (cs->is_empty())  continue;  // skip trivial section
      CodeSection* dest_cs = dest->code_section(n);
      assert(cs->size() == dest_cs->size(), "sanity");
      csize_t usize = dest_cs->size();
!     csize_t wsize = align_up(usize, HeapWordSize);
      assert(dest_cs->start() + wsize <= dest_end, "no overflow");
      // Copy the code as aligned machine words.
      // This may also include an uninitialized partial word at the end.
      Copy::disjoint_words((HeapWord*)cs->start(),
                           (HeapWord*)dest_cs->start(),