src/share/vm/prims/jvmtiTagMap.cpp

@@ -1519,11 +1519,11 @@
     for (int i=0; i<_tag_count; i++) {
       if (_tags[i] == entry->tag()) {
         oop o = entry->object();
         assert(o != NULL && Universe::heap()->is_in_reserved(o), "sanity check");
 #if INCLUDE_ALL_GCS
-        if (UseG1GC) {
+        if (UseG1GC || (UseShenandoahGC && ShenandoahSATBBarrier)) {
           // The reference in this tag map could be the only (implicitly weak)
           // reference to that object. If we hand it out, we need to keep it live wrt
           // SATB marking similar to other j.l.ref.Reference referents.
           G1SATBCardTableModRefBS::enqueue(o);
         }