1.1 --- a/src/share/vm/gc_implementation/concurrentMarkSweep/vmStructs_cms.hpp Tue Jan 22 13:42:39 2013 +0100
1.2 +++ b/src/share/vm/gc_implementation/concurrentMarkSweep/vmStructs_cms.hpp Thu Jan 03 15:03:27 2013 -0800
1.3 @@ -25,8 +25,6 @@
1.4 #ifndef SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_VMSTRUCTS_CMS_HPP
1.5 #define SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_VMSTRUCTS_CMS_HPP
1.6
1.7 -typedef BinaryTreeDictionary<FreeChunk, AdaptiveFreeList> AFLBinaryTreeDictionary;
1.8 -
1.9 #define VM_STRUCTS_CMS(nonstatic_field, \
1.10 volatile_nonstatic_field, \
1.11 static_field) \
1.12 @@ -42,6 +40,7 @@
1.13 static_field(ConcurrentMarkSweepThread, _collector, CMSCollector*) \
1.14 nonstatic_field(LinearAllocBlock, _word_size, size_t) \
1.15 nonstatic_field(AFLBinaryTreeDictionary, _total_size, size_t) \
1.16 + nonstatic_field(CompactibleFreeListSpace, _dictionary, AFLBinaryTreeDictionary*) \
1.17 nonstatic_field(CompactibleFreeListSpace, _indexedFreeList[0], FreeList<FreeChunk>) \
1.18 nonstatic_field(CompactibleFreeListSpace, _smallLinearAllocBlock, LinearAllocBlock)
1.19
1.20 @@ -62,10 +61,9 @@
1.21 declare_toplevel_type(SurrogateLockerThread*) \
1.22 declare_toplevel_type(CompactibleFreeListSpace*) \
1.23 declare_toplevel_type(CMSCollector*) \
1.24 - declare_toplevel_type(AFLBinaryTreeDictionary*) \
1.25 + declare_toplevel_type(AFLBinaryTreeDictionary) \
1.26 declare_toplevel_type(LinearAllocBlock) \
1.27 - declare_toplevel_type(FreeBlockDictionary<FreeChunk>) \
1.28 - declare_type(AFLBinaryTreeDictionary, FreeBlockDictionary<FreeChunk>)
1.29 + declare_toplevel_type(FreeBlockDictionary<FreeChunk>)
1.30
1.31 #define VM_INT_CONSTANTS_CMS(declare_constant) \
1.32 declare_constant(Generation::ConcurrentMarkSweep) \
