1.1 --- a/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp Fri Aug 31 16:39:35 2012 -0700 1.2 +++ b/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp Sat Sep 01 13:25:18 2012 -0400 1.3 @@ -70,7 +70,6 @@ 1.4 friend class ConcurrentMarkSweepGeneration; 1.5 friend class ASConcurrentMarkSweepGeneration; 1.6 friend class CMSCollector; 1.7 - friend class CMSPermGenGen; 1.8 // Local alloc buffer for promotion into this space. 1.9 friend class CFLS_LAB; 1.10 1.11 @@ -349,8 +348,8 @@ 1.12 Mutex* freelistLock() const { return &_freelistLock; } 1.13 1.14 // Iteration support 1.15 - void oop_iterate(MemRegion mr, OopClosure* cl); 1.16 - void oop_iterate(OopClosure* cl); 1.17 + void oop_iterate(MemRegion mr, ExtendedOopClosure* cl); 1.18 + void oop_iterate(ExtendedOopClosure* cl); 1.19 1.20 void object_iterate(ObjectClosure* blk); 1.21 // Apply the closure to each object in the space whose references 1.22 @@ -377,7 +376,7 @@ 1.23 object_iterate_careful(ObjectClosureCareful* cl); 1.24 1.25 // Override: provides a DCTO_CL specific to this kind of space. 1.26 - DirtyCardToOopClosure* new_dcto_cl(OopClosure* cl, 1.27 + DirtyCardToOopClosure* new_dcto_cl(ExtendedOopClosure* cl, 1.28 CardTableModRefBS::PrecisionStyle precision, 1.29 HeapWord* boundary); 1.30