src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp

*** 48,58 ****
  #include "memory/gcLocker.inline.hpp"
  #include "memory/referencePolicy.hpp"
  #include "memory/referenceProcessor.hpp"
  #include "oops/methodData.hpp"
  #include "oops/oop.inline.hpp"
- #include "oops/oop.pcgc.inline.hpp"
  #include "runtime/atomic.inline.hpp"
  #include "runtime/fprofiler.hpp"
  #include "runtime/safepoint.hpp"
  #include "runtime/vmThread.hpp"
  #include "services/management.hpp"
--- 48,57 ----
*** 2774,2783 ****
--- 2773,2787 ----
      print_region_ranges();
    }
  }
  #endif  // #ifdef ASSERT
  
+ inline void UpdateOnlyClosure::do_addr(HeapWord* addr) {
+   _start_array->allocate_block(addr);
+   compaction_manager()->update_contents(oop(addr));
+ }
+ 
  // Update interior oops in the ranges of regions [beg_region, end_region).
  void
  PSParallelCompact::update_and_deadwood_in_dense_prefix(ParCompactionManager* cm,
                                                         SpaceId space_id,
                                                         size_t beg_region,
*** 2874,2884 ****
      HeapWord* const addr = cur_region->deferred_obj_addr();
      if (addr != NULL) {
        if (start_array != NULL) {
          start_array->allocate_block(addr);
        }
!       oop(addr)->update_contents(cm);
        assert(oop(addr)->is_oop_or_null(), err_msg("Expected an oop or NULL at " PTR_FORMAT, p2i(oop(addr))));
      }
    }
  }
  
--- 2878,2888 ----
      HeapWord* const addr = cur_region->deferred_obj_addr();
      if (addr != NULL) {
        if (start_array != NULL) {
          start_array->allocate_block(addr);
        }
!       cm->update_contents(oop(addr));
        assert(oop(addr)->is_oop_or_null(), err_msg("Expected an oop or NULL at " PTR_FORMAT, p2i(oop(addr))));
      }
    }
  }
  
*** 3358,3368 ****
      DEBUG_ONLY(PSParallelCompact::check_new_location(source(), destination());)
      Copy::aligned_conjoint_words(source(), destination(), words);
    }
  
    oop moved_oop = (oop) destination();
!   moved_oop->update_contents(compaction_manager());
    assert(moved_oop->is_oop_or_null(), err_msg("Expected an oop or NULL at " PTR_FORMAT, p2i(moved_oop)));
  
    update_state(words);
    assert(destination() == (HeapWord*)moved_oop + moved_oop->size(), "sanity");
    return is_full() ? ParMarkBitMap::full : ParMarkBitMap::incomplete;
--- 3362,3372 ----
      DEBUG_ONLY(PSParallelCompact::check_new_location(source(), destination());)
      Copy::aligned_conjoint_words(source(), destination(), words);
    }
  
    oop moved_oop = (oop) destination();
!   compaction_manager()->update_contents(moved_oop);
    assert(moved_oop->is_oop_or_null(), err_msg("Expected an oop or NULL at " PTR_FORMAT, p2i(moved_oop)));
  
    update_state(words);
    assert(destination() == (HeapWord*)moved_oop + moved_oop->size(), "sanity");
    return is_full() ? ParMarkBitMap::full : ParMarkBitMap::incomplete;