--- a/src/hotspot/share/runtime/stackValue.cpp	Mon Jun 10 05:09:52 2019 +0200
+++ b/src/hotspot/share/runtime/stackValue.cpp	Thu Feb 14 14:54:05 2019 +0100
@@ -133,16 +133,12 @@
       }
 #endif
       // Deoptimization must make sure all oops have passed load barriers
-#if INCLUDE_ZGC
-      if (UseZGC) {
-        val = ZBarrier::load_barrier_on_oop_field_preloaded((oop*)value_addr, val);
-      }
-#endif
 #if INCLUDE_SHENANDOAHGC
       if (UseShenandoahGC) {
         val = ShenandoahBarrierSet::barrier_set()->load_reference_barrier(val);
       }
 #endif
+      assert(oopDesc::is_oop_or_null(val, false), "bad oop found");
       Handle h(Thread::current(), val); // Wrap a handle around the oop
       return new StackValue(h);
     }