src/share/vm/oops/instanceRefKlass.inline.hpp

@@ -44,11 +44,14 @@
   T* referent_addr = (T*)java_lang_ref_Reference::referent_addr(obj);
   T heap_oop = oopDesc::load_heap_oop(referent_addr);
   ReferenceProcessor* rp = closure->_ref_processor;
   if (!oopDesc::is_null(heap_oop)) {
     oop referent = oopDesc::decode_heap_oop_not_null(heap_oop);
-    if (!referent->is_gc_marked() && (rp != NULL) &&
+    if (UseShenandoahGC) {
+      referent = ShenandoahBarrierSet::resolve_and_update_oop_static(referent_addr, referent);
+    }
+    if ((UseShenandoahGC || !referent->is_gc_marked()) && (rp != NULL) &&
         rp->discover_reference(obj, reference_type())) {
       return;
     } else if (contains(referent_addr)) {
       // treat referent as normal oop
       Devirtualizer<nv>::do_oop(closure, referent_addr);