--- a/hotspot/src/share/vm/memory/universe.cpp	Wed Apr 12 13:05:59 2017 +0200
+++ b/hotspot/src/share/vm/memory/universe.cpp	Wed Apr 12 17:53:18 2017 +0200
@@ -552,7 +552,7 @@
 
 
 bool Universe::on_page_boundary(void* addr) {
-  return ((uintptr_t) addr) % os::vm_page_size() == 0;
+  return is_ptr_aligned(addr, os::vm_page_size());
 }