--- a/hotspot/src/share/vm/runtime/jniHandles.cpp	Wed Apr 12 17:53:18 2017 +0200
+++ b/hotspot/src/share/vm/runtime/jniHandles.cpp	Tue Jul 04 15:58:10 2017 +0200
@@ -101,7 +101,7 @@
       res = _weak_global_handles->allocate_handle(obj());
     }
     // Add weak tag.
-    assert(is_ptr_aligned(res, weak_tag_alignment), "invariant");
+    assert(is_aligned(res, weak_tag_alignment), "invariant");
     char* tptr = reinterpret_cast<char*>(res) + weak_tag_value;
     res = reinterpret_cast<jobject>(tptr);
   } else {