--- a/hotspot/src/share/vm/gc/shared/collectedHeap.inline.hpp	Wed Apr 12 17:53:18 2017 +0200
+++ b/hotspot/src/share/vm/gc/shared/collectedHeap.inline.hpp	Tue Jul 04 15:58:10 2017 +0200
@@ -268,12 +268,12 @@
     return addr;
   }
 
-  assert(is_ptr_aligned(addr, HeapWordSize),
+  assert(is_aligned(addr, HeapWordSize),
          "Address " PTR_FORMAT " is not properly aligned.", p2i(addr));
-  assert(is_size_aligned(alignment_in_bytes, HeapWordSize),
+  assert(is_aligned(alignment_in_bytes, HeapWordSize),
          "Alignment size %u is incorrect.", alignment_in_bytes);
 
-  HeapWord* new_addr = align_ptr_up(addr, alignment_in_bytes);
+  HeapWord* new_addr = align_up(addr, alignment_in_bytes);
   size_t padding = pointer_delta(new_addr, addr);
 
   if (padding == 0) {