src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.inline.hpp

rev 57589 : 8237632: Shenandoah fails some vmTestbase_nsk_jvmti tests with "Forwardee must point to a heap address"

*** 238,248 ****
--- 238,250 ----
      oop obj = CompressedOops::decode_not_null(o);
      switch (UPDATE_REFS) {
      case NONE:
        break;
      case RESOLVE:
+       if (heap->in_collection_set(obj)) {
          obj = ShenandoahBarrierSet::resolve_forwarded_not_null(obj);
+       }
        break;
      case SIMPLE:
        // We piggy-back reference updating to the marking tasks.
        obj = heap->update_with_forwarded_not_null(p, obj);
        break;