--- old/src/hotspot/share/memory/universe.cpp	2018-02-22 16:36:17.864558992 +0100
+++ new/src/hotspot/share/memory/universe.cpp	2018-02-22 16:36:17.584560806 +0100
@@ -167,7 +167,7 @@
 NarrowPtrStruct Universe::_narrow_klass = { NULL, 0, true };
 address Universe::_narrow_ptrs_base;
 
-int Universe::_oop_metadata_odd_mask = 0;
+int Universe::_oop_metadata_odd_mask = KlassPtrEvenOddMask;
 
 void Universe::basic_type_classes_do(void f(Klass*)) {
   f(boolArrayKlassObj());