Mercurial > hg > truffle
changeset 14049:6b8e10e585df
removed duplicate vmStructs entries
| author | twisti |
|---|---|
| date | Mon, 03 Mar 2014 20:40:23 -0800 |
| parents | d2c84a0bf37a |
| children | 516eeabb4c62 |
| files | src/share/vm/gc_implementation/g1/vmStructs_g1.hpp src/share/vm/runtime/vmStructs.cpp |
| diffstat | 2 files changed, 1 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/g1/vmStructs_g1.hpp Tue Mar 04 01:08:46 2014 +0000 +++ b/src/share/vm/gc_implementation/g1/vmStructs_g1.hpp Mon Mar 03 20:40:23 2014 -0800 @@ -68,6 +68,7 @@ \ declare_type(G1CollectedHeap, SharedHeap) \ \ + declare_type(G1OffsetTableContigSpace, ContiguousSpace) \ declare_type(HeapRegion, ContiguousSpace) \ declare_toplevel_type(HeapRegionSeq) \ declare_toplevel_type(HeapRegionSetBase) \
--- a/src/share/vm/runtime/vmStructs.cpp Tue Mar 04 01:08:46 2014 +0000 +++ b/src/share/vm/runtime/vmStructs.cpp Mon Mar 03 20:40:23 2014 -0800 @@ -568,8 +568,6 @@ nonstatic_field(Space, _bottom, HeapWord*) \ nonstatic_field(Space, _end, HeapWord*) \ \ - static_field(HeapRegion, LogOfHRGrainBytes, int) \ - \ nonstatic_field(ThreadLocalAllocBuffer, _start, HeapWord*) \ nonstatic_field(ThreadLocalAllocBuffer, _top, HeapWord*) \ nonstatic_field(ThreadLocalAllocBuffer, _end, HeapWord*) \ @@ -1533,8 +1531,6 @@ declare_type(EdenSpace, ContiguousSpace) \ declare_type(OffsetTableContigSpace, ContiguousSpace) \ declare_type(TenuredSpace, OffsetTableContigSpace) \ - declare_type(G1OffsetTableContigSpace, ContiguousSpace) \ - declare_type(HeapRegion, G1OffsetTableContigSpace) \ declare_toplevel_type(BarrierSet) \ declare_type(ModRefBarrierSet, BarrierSet) \ declare_type(CardTableModRefBS, ModRefBarrierSet) \