--- a/hotspot/src/share/vm/gc/parallel/psYoungGen.cpp	Thu Jun 22 09:07:47 2017 +0200
+++ b/hotspot/src/share/vm/gc/parallel/psYoungGen.cpp	Tue Apr 11 23:45:37 2017 +0200
@@ -193,9 +193,9 @@
   char *from_end   = from_start + survivor_size;
 
   assert(from_end == virtual_space()->high(), "just checking");
-  assert(is_object_aligned((intptr_t)eden_start), "checking alignment");
-  assert(is_object_aligned((intptr_t)to_start),   "checking alignment");
-  assert(is_object_aligned((intptr_t)from_start), "checking alignment");
+  assert(is_ptr_object_aligned(eden_start), "checking alignment");
+  assert(is_ptr_object_aligned(to_start),   "checking alignment");
+  assert(is_ptr_object_aligned(from_start), "checking alignment");
 
   MemRegion eden_mr((HeapWord*)eden_start, (HeapWord*)to_start);
   MemRegion to_mr  ((HeapWord*)to_start, (HeapWord*)from_start);
@@ -611,9 +611,9 @@
             "from start moved to the right");
   guarantee((HeapWord*)from_end >= from_space()->top(),
             "from end moved into live data");
-  assert(is_object_aligned((intptr_t)eden_start), "checking alignment");
-  assert(is_object_aligned((intptr_t)from_start), "checking alignment");
-  assert(is_object_aligned((intptr_t)to_start), "checking alignment");
+  assert(is_ptr_object_aligned(eden_start), "checking alignment");
+  assert(is_ptr_object_aligned(from_start), "checking alignment");
+  assert(is_ptr_object_aligned(to_start), "checking alignment");
 
   MemRegion edenMR((HeapWord*)eden_start, (HeapWord*)eden_end);
   MemRegion toMR  ((HeapWord*)to_start,   (HeapWord*)to_end);