1.1 --- a/src/share/vm/memory/generation.hpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/share/vm/memory/generation.hpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -48,18 +48,17 @@
1.4 // - OneContigSpaceCardGeneration - abstract class holding a single
1.5 // contiguous space with card marking
1.6 // - TenuredGeneration - tenured (old object) space (markSweepCompact)
1.7 -// - CompactingPermGenGen - reflective object area (klasses, methods, symbols, ...)
1.8 // - ConcurrentMarkSweepGeneration - Mostly Concurrent Mark Sweep Generation
1.9 // (Detlefs-Printezis refinement of
1.10 // Boehm-Demers-Schenker)
1.11 //
1.12 // The system configurations currently allowed are:
1.13 //
1.14 -// DefNewGeneration + TenuredGeneration + PermGeneration
1.15 -// DefNewGeneration + ConcurrentMarkSweepGeneration + ConcurrentMarkSweepPermGen
1.16 +// DefNewGeneration + TenuredGeneration
1.17 +// DefNewGeneration + ConcurrentMarkSweepGeneration
1.18 //
1.19 -// ParNewGeneration + TenuredGeneration + PermGeneration
1.20 -// ParNewGeneration + ConcurrentMarkSweepGeneration + ConcurrentMarkSweepPermGen
1.21 +// ParNewGeneration + TenuredGeneration
1.22 +// ParNewGeneration + ConcurrentMarkSweepGeneration
1.23 //
1.24
1.25 class DefNewGeneration;
1.26 @@ -442,7 +441,6 @@
1.27 // Mark sweep support phase2
1.28 virtual void prepare_for_compaction(CompactPoint* cp);
1.29 // Mark sweep support phase3
1.30 - virtual void pre_adjust_pointers() {ShouldNotReachHere();}
1.31 virtual void adjust_pointers();
1.32 // Mark sweep support phase4
1.33 virtual void compact();
1.34 @@ -538,11 +536,11 @@
1.35
1.36 // Iterate over all the ref-containing fields of all objects in the
1.37 // generation, calling "cl.do_oop" on each.
1.38 - virtual void oop_iterate(OopClosure* cl);
1.39 + virtual void oop_iterate(ExtendedOopClosure* cl);
1.40
1.41 // Same as above, restricted to the intersection of a memory region and
1.42 // the generation.
1.43 - virtual void oop_iterate(MemRegion mr, OopClosure* cl);
1.44 + virtual void oop_iterate(MemRegion mr, ExtendedOopClosure* cl);
1.45
1.46 // Iterate over all objects in the generation, calling "cl.do_object" on
1.47 // each.
1.48 @@ -666,7 +664,6 @@
1.49 class OneContigSpaceCardGeneration: public CardGeneration {
1.50 friend class VMStructs;
1.51 // Abstractly, this is a subtype that gets access to protected fields.
1.52 - friend class CompactingPermGen;
1.53 friend class VM_PopulateDumpSharedSpace;
1.54
1.55 protected:
