1.1 --- a/src/share/vm/gc_implementation/g1/heapRegion.cpp Wed Apr 11 16:18:45 2012 +0200
1.2 +++ b/src/share/vm/gc_implementation/g1/heapRegion.cpp Wed Apr 18 07:21:15 2012 -0400
1.3 @@ -334,7 +334,7 @@
1.4
1.5 guarantee(GrainWords == 0, "we should only set it once");
1.6 GrainWords = GrainBytes >> LogHeapWordSize;
1.7 - guarantee((size_t)(1 << LogOfHRGrainWords) == GrainWords, "sanity");
1.8 + guarantee((size_t) 1 << LogOfHRGrainWords == GrainWords, "sanity");
1.9
1.10 guarantee(CardsPerRegion == 0, "we should only set it once");
1.11 CardsPerRegion = GrainBytes >> CardTableModRefBS::card_shift;
1.12 @@ -482,10 +482,10 @@
1.13 #endif // _MSC_VER
1.14
1.15
1.16 -HeapRegion::
1.17 -HeapRegion(size_t hrs_index, G1BlockOffsetSharedArray* sharedOffsetArray,
1.18 - MemRegion mr, bool is_zeroed)
1.19 - : G1OffsetTableContigSpace(sharedOffsetArray, mr, is_zeroed),
1.20 +HeapRegion::HeapRegion(uint hrs_index,
1.21 + G1BlockOffsetSharedArray* sharedOffsetArray,
1.22 + MemRegion mr, bool is_zeroed) :
1.23 + G1OffsetTableContigSpace(sharedOffsetArray, mr, is_zeroed),
1.24 _hrs_index(hrs_index),
1.25 _humongous_type(NotHumongous), _humongous_start_region(NULL),
1.26 _in_collection_set(false),
