--- old/src/hotspot/share/compiler/oopMap.cpp	2018-03-16 09:52:26.110590512 +0100
+++ new/src/hotspot/share/compiler/oopMap.cpp	2018-03-16 09:52:25.927582700 +0100
@@ -379,7 +379,7 @@
           continue;
         }
 #ifdef ASSERT
-        if (!UseLoadBarrier &&
+        if (!UseZGC &&
             ((((uintptr_t)loc & (sizeof(*loc)-1)) != 0) ||
              !Universe::heap()->is_in_or_null(*loc))) {
           tty->print_cr("# Found non oop pointer.  Dumping state at failure");