1.1 --- a/src/share/vm/gc_implementation/g1/heapRegion.hpp Wed Jun 25 16:53:13 2014 +0200 1.2 +++ b/src/share/vm/gc_implementation/g1/heapRegion.hpp Thu Jun 26 10:00:00 2014 +0200 1.3 @@ -148,7 +148,7 @@ 1.4 void set_end(HeapWord* value); 1.5 1.6 virtual HeapWord* saved_mark_word() const; 1.7 - virtual void set_saved_mark(); 1.8 + void record_top_and_timestamp(); 1.9 void reset_gc_time_stamp() { _gc_time_stamp = 0; } 1.10 unsigned get_gc_time_stamp() { return _gc_time_stamp; } 1.11 1.12 @@ -202,10 +202,6 @@ 1.13 ContinuesHumongous 1.14 }; 1.15 1.16 - // Requires that the region "mr" be dense with objects, and begin and end 1.17 - // with an object. 1.18 - void oops_in_mr_iterate(MemRegion mr, ExtendedOopClosure* cl); 1.19 - 1.20 // The remembered set for this region. 1.21 // (Might want to make this "inline" later, to avoid some alloc failure 1.22 // issues.) 1.23 @@ -569,9 +565,6 @@ 1.24 1.25 HeapWord* orig_end() { return _orig_end; } 1.26 1.27 - // Allows logical separation between objects allocated before and after. 1.28 - void save_marks(); 1.29 - 1.30 // Reset HR stuff to default values. 1.31 void hr_clear(bool par, bool clear_space, bool locked = false); 1.32 void par_clear(); 1.33 @@ -580,10 +573,6 @@ 1.34 HeapWord* prev_top_at_mark_start() const { return _prev_top_at_mark_start; } 1.35 HeapWord* next_top_at_mark_start() const { return _next_top_at_mark_start; } 1.36 1.37 - // Apply "cl->do_oop" to (the addresses of) all reference fields in objects 1.38 - // allocated in the current region before the last call to "save_mark". 1.39 - void oop_before_save_marks_iterate(ExtendedOopClosure* cl); 1.40 - 1.41 // Note the start or end of marking. This tells the heap region 1.42 // that the collector is about to start or has finished (concurrently) 1.43 // marking the heap. 1.44 @@ -769,10 +758,6 @@ 1.45 _predicted_bytes_to_copy = bytes; 1.46 } 1.47 1.48 -#define HeapRegion_OOP_SINCE_SAVE_MARKS_DECL(OopClosureType, nv_suffix) \ 1.49 - virtual void oop_since_save_marks_iterate##nv_suffix(OopClosureType* cl); 1.50 - SPECIALIZED_SINCE_SAVE_MARKS_CLOSURES(HeapRegion_OOP_SINCE_SAVE_MARKS_DECL) 1.51 - 1.52 virtual CompactibleSpace* next_compaction_space() const; 1.53 1.54 virtual void reset_after_compaction();