--- a/src/hotspot/share/opto/graphKit.cpp	Tue Oct 23 13:47:17 2018 +0800
+++ b/src/hotspot/share/opto/graphKit.cpp	Wed Oct 17 10:19:13 2018 +0200
@@ -3726,6 +3726,10 @@
   if (ptr == NULL) {     // reduce dumb test in callers
     return NULL;
   }
+
+  BarrierSetC2* bs = BarrierSet::barrier_set()->barrier_set_c2();
+  ptr = bs->step_over_gc_barrier(ptr);
+
   if (ptr->is_CheckCastPP()) { // strip only one raw-to-oop cast
     ptr = ptr->in(1);
     if (ptr == NULL) return NULL;