--- old/src/hotspot/share/compiler/oopMap.cpp	2018-10-17 09:20:10.000000000 -0400
+++ new/src/hotspot/share/compiler/oopMap.cpp	2018-10-17 09:20:10.000000000 -0400
@@ -361,7 +361,6 @@
 
   // We want coop and oop oop_types
   int mask = OopMapValue::oop_value | OopMapValue::narrowoop_value;
-  BufferedValuesDealiaser* dealiaser = NULL;
   {
     for (OopMapStream oms(map,mask); !oms.is_done(); oms.next()) {
       omv = oms.current();
@@ -387,7 +386,7 @@
         // load barrier.
         if (!UseZGC &&
             ((((uintptr_t)loc & (sizeof(*loc)-1)) != 0) ||
-             (!Universe::heap()->is_in_or_null(*loc) && !VTBuffer::is_in_vt_buffer(*loc)))) {
+                (!Universe::heap()->is_in_or_null(*loc)))) {
           tty->print_cr("# Found non oop pointer.  Dumping state at failure");
           // try to dump out some helpful debugging information
           trace_codeblob_maps(fr, reg_map);
@@ -396,19 +395,10 @@
           omv.reg()->print();
           tty->print_cr("loc = %p *loc = %p\n", loc, (address)*loc);
           // do the real assert.
-          assert(Universe::heap()->is_in_or_null(*loc) || VTBuffer::is_in_vt_buffer(*loc),
-                 "found non oop pointer");
+          assert(Universe::heap()->is_in_or_null(*loc), "found non oop pointer");
         }
 #endif // ASSERT
-        if (!VTBuffer::is_in_vt_buffer(*loc)) {
-          oop_fn->do_oop(loc);
-        } else {
-          assert((*loc)->is_value(), "Sanity check");
-          if (dealiaser == NULL) {
-            dealiaser = Thread::current()->buffered_values_dealiaser();
-          }
-          dealiaser->oops_do(oop_fn, *loc);
-        }
+        oop_fn->do_oop(loc);
       } else if ( omv.type() == OopMapValue::narrowoop_value ) {
         narrowOop *nl = (narrowOop*)loc;
 #ifndef VM_LITTLE_ENDIAN