--- a/hotspot/src/share/vm/gc/parallel/psPromotionLAB.inline.hpp	Wed Apr 12 17:53:18 2017 +0200
+++ b/hotspot/src/share/vm/gc/parallel/psPromotionLAB.inline.hpp	Tue Jul 04 15:58:10 2017 +0200
@@ -40,7 +40,7 @@
   // The 'new_top>obj' check is needed to detect overflow of obj+size.
   if (new_top > obj && new_top <= end()) {
     set_top(new_top);
-    assert(is_ptr_aligned(obj, SurvivorAlignmentInBytes) && is_ptr_object_aligned(new_top),
+    assert(is_aligned(obj, SurvivorAlignmentInBytes) && is_object_aligned(new_top),
            "checking alignment");
     return obj;
   } else {