comparison src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp @ 12356:359f7e70ae7f

Reduce HotSpot diff and fix previous merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Fri, 11 Oct 2013 15:41:33 +0200
parents cefad50507d8
children 02f27ecb4f3a
comparison
equal deleted inserted replaced
12355:cefad50507d8 12356:359f7e70ae7f
686 virtual void gc_epilogue(bool full); 686 virtual void gc_epilogue(bool full);
687 687
688 #ifdef GRAAL 688 #ifdef GRAAL
689 HeapWord** top_addr() const; 689 HeapWord** top_addr() const;
690 HeapWord** end_addr() const; 690 HeapWord** end_addr() const;
691
692 #endif 691 #endif
693 692
694 // We register a region with the fast "in collection set" test. We 693 // We register a region with the fast "in collection set" test. We
695 // simply set to true the array slot corresponding to this region. 694 // simply set to true the array slot corresponding to this region.
696 void register_region_with_in_cset_fast_test(HeapRegion* r) { 695 void register_region_with_in_cset_fast_test(HeapRegion* r) {