src/hotspot/share/cds/archiveUtils.cpp

@@ -239,13 +239,14 @@
    }
    log_debug(cds)("Expanding %s spaces by " SIZE_FORMAT_W(7) " bytes [total " SIZE_FORMAT_W(9)  " bytes ending at %p]",
                   which, commit, _vs->actual_committed_size(), _vs->high());
  }
  
- 
- char* DumpRegion::allocate(size_t num_bytes) {
-   char* p = (char*)align_up(_top, (size_t)SharedSpaceObjectAlignment);
+ char* DumpRegion::allocate(size_t num_bytes, size_t alignment) {
+   // Always align to at least minimum alignment
+   alignment = MAX2(SharedSpaceObjectAlignment, alignment);
+   char* p = (char*)align_up(_top, alignment);
    char* newtop = p + align_up(num_bytes, (size_t)SharedSpaceObjectAlignment);
    expand_top_to(newtop);
    memset(p, 0, newtop - p);
    return p;
  }

@@ -349,11 +350,11 @@
  
  void ReadClosure::do_tag(int tag) {
    int old_tag;
    old_tag = (int)(intptr_t)nextPtr();
    // do_int(&old_tag);
-   assert(tag == old_tag, "old tag doesn't match");
+   assert(tag == old_tag, "tag doesn't match (%d, expected %d)", old_tag, tag);
    FileMapInfo::assert_mark(tag == old_tag);
  }
  
  void ReadClosure::do_region(u_char* start, size_t size) {
    assert((intptr_t)start % sizeof(intptr_t) == 0, "bad alignment");