src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp

*** 47,57 ****
  #include "memory/genOopClosures.inline.hpp"
  #include "memory/generationSpec.hpp"
  #include "memory/referenceProcessor.hpp"
  #include "oops/oop.inline.hpp"
  #include "oops/oop.pcgc.inline.hpp"
- #include "runtime/aprofiler.hpp"
  #include "runtime/vmThread.hpp"
  
  size_t G1CollectedHeap::_humongous_object_threshold_in_words = 0;
  
  // turn it on so that the contents of the young list (scan-only /
--- 47,56 ----
*** 2597,2611 ****
  void G1CollectedHeap::object_iterate(ObjectClosure* cl) {
    IterateObjectClosureRegionClosure blk(cl);
    heap_region_iterate(&blk);
  }
  
- void G1CollectedHeap::object_iterate_since_last_GC(ObjectClosure* cl) {
-   // FIXME: is this right?
-   guarantee(false, "object_iterate_since_last_GC not supported by G1 heap");
- }
- 
  // Calls a SpaceClosure on a HeapRegion.
  
  class SpaceClosureRegionClosure: public HeapRegionClosure {
    SpaceClosure* _cl;
  public:
--- 2596,2605 ----
*** 3530,3541 ****
  }
  
  void G1CollectedHeap::gc_prologue(bool full /* Ignored */) {
    // always_do_update_barrier = false;
    assert(InlineCacheBuffer::is_empty(), "should have cleaned up ICBuffer");
-   // Call allocation profiler
-   AllocationProfiler::iterate_since_last_gc();
    // Fill TLAB's and such
    ensure_parsability(true);
  }
  
  void G1CollectedHeap::gc_epilogue(bool full /* Ignored */) {
--- 3524,3533 ----