--- a/hotspot/src/share/vm/oops/klass.hpp	Wed May 17 23:36:19 2017 +0200
+++ b/hotspot/src/share/vm/oops/klass.hpp	Fri May 19 08:36:49 2017 +0200
@@ -366,7 +366,7 @@
   static int layout_helper_log2_element_size(jint lh) {
     assert(lh < (jint)_lh_neutral_value, "must be array");
     int l2esz = (lh >> _lh_log2_element_size_shift) & _lh_log2_element_size_mask;
-    assert(l2esz <= LogBitsPerLong,
+    assert(l2esz <= LogBytesPerLong,
            "sanity. l2esz: 0x%x for lh: 0x%x", (uint)l2esz, (uint)lh);
     return l2esz;
   }