1.1 --- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Tue Jul 02 16:54:24 2013 +0200 1.2 +++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Wed Jul 03 17:26:59 2013 -0400 1.3 @@ -54,7 +54,6 @@ 1.4 #include "memory/referenceProcessor.hpp" 1.5 #include "oops/oop.inline.hpp" 1.6 #include "oops/oop.pcgc.inline.hpp" 1.7 -#include "runtime/aprofiler.hpp" 1.8 #include "runtime/vmThread.hpp" 1.9 1.10 size_t G1CollectedHeap::_humongous_object_threshold_in_words = 0; 1.11 @@ -2665,11 +2664,6 @@ 1.12 heap_region_iterate(&blk); 1.13 } 1.14 1.15 -void G1CollectedHeap::object_iterate_since_last_GC(ObjectClosure* cl) { 1.16 - // FIXME: is this right? 1.17 - guarantee(false, "object_iterate_since_last_GC not supported by G1 heap"); 1.18 -} 1.19 - 1.20 // Calls a SpaceClosure on a HeapRegion. 1.21 1.22 class SpaceClosureRegionClosure: public HeapRegionClosure { 1.23 @@ -3598,8 +3592,6 @@ 1.24 void G1CollectedHeap::gc_prologue(bool full /* Ignored */) { 1.25 // always_do_update_barrier = false; 1.26 assert(InlineCacheBuffer::is_empty(), "should have cleaned up ICBuffer"); 1.27 - // Call allocation profiler 1.28 - AllocationProfiler::iterate_since_last_gc(); 1.29 // Fill TLAB's and such 1.30 ensure_parsability(true); 1.31 }