--- old/src/share/vm/utilities/hashtable.cpp	2017-07-27 12:12:33.704083287 -0700
+++ new/src/share/vm/utilities/hashtable.cpp	2017-07-27 12:12:33.560077716 -0700
@@ -205,7 +205,7 @@
 
 // Dump the hash table entries (into CDS archive)
 template <MEMFLAGS F> void BasicHashtable<F>::copy_table(char* top, char* end) {
-  assert(is_ptr_aligned(top, sizeof(intptr_t)), "bad alignment");
+  assert(is_aligned(top, sizeof(intptr_t)), "bad alignment");
   intptr_t *plen = (intptr_t*)(top);
   top += sizeof(*plen);
 
@@ -214,7 +214,7 @@
     for (BasicHashtableEntry<F>** p = _buckets[i].entry_addr();
          *p != NULL;
          p = (*p)->next_addr()) {
-      *p = (BasicHashtableEntry<F>*)memcpy(top, *p, entry_size());
+      *p = (BasicHashtableEntry<F>*)memcpy(top, (void*)*p, entry_size());
       top += entry_size();
     }
   }
@@ -294,7 +294,7 @@
 
 // Dump the buckets (into CDS archive)
 template <MEMFLAGS F> void BasicHashtable<F>::copy_buckets(char* top, char* end) {
-  assert(is_ptr_aligned(top, sizeof(intptr_t)), "bad alignment");
+  assert(is_aligned(top, sizeof(intptr_t)), "bad alignment");
   intptr_t len = _table_size * sizeof(HashtableBucket<F>);
   *(intptr_t*)(top) = len;
   top += sizeof(intptr_t);