--- old/src/hotspot/share/memory/universe.hpp	2018-03-07 15:00:25.000049065 +0100
+++ new/src/hotspot/share/memory/universe.hpp	2018-03-07 15:00:24.800044450 +0100
@@ -444,7 +444,9 @@
   static void     set_narrow_klass_shift(int shift)       {
     assert(shift == 0 || shift == LogKlassAlignmentInBytes, "invalid shift for klass ptrs");
     _narrow_klass._shift   = shift;
-    _oop_metadata_odd_mask = (shift) ? 1 : KlassPtrEvenOddMask;
+    if (shift == LogKlassAlignmentInBytes) {
+      _oop_metadata_odd_mask = 1;
+    }
   }
 
   static int oop_metadata_odd_mask() { return _oop_metadata_odd_mask; }