Mercurial > hg > graal-compiler
comparison src/share/vm/gc_implementation/g1/heapRegion.cpp @ 6010:720b6a76dd9d
7157073: G1: type change size_t -> uint for region counts / indexes
Summary: Change the type of fields / variables / etc. that represent region counts and indeces from size_t to uint.
Reviewed-by: iveresov, brutisso, jmasa, jwilhelm
author | tonyp |
---|---|
date | Wed, 18 Apr 2012 07:21:15 -0400 |
parents | b632e80fc9dc |
children | f7a8920427a6 |
comparison
equal
deleted
inserted
replaced
6009:dde53abda3d6 | 6010:720b6a76dd9d |
---|---|
332 // MIN_REGION_SIZE and MAX_REGION_SIZE. | 332 // MIN_REGION_SIZE and MAX_REGION_SIZE. |
333 GrainBytes = (size_t)region_size; | 333 GrainBytes = (size_t)region_size; |
334 | 334 |
335 guarantee(GrainWords == 0, "we should only set it once"); | 335 guarantee(GrainWords == 0, "we should only set it once"); |
336 GrainWords = GrainBytes >> LogHeapWordSize; | 336 GrainWords = GrainBytes >> LogHeapWordSize; |
337 guarantee((size_t)(1 << LogOfHRGrainWords) == GrainWords, "sanity"); | 337 guarantee((size_t) 1 << LogOfHRGrainWords == GrainWords, "sanity"); |
338 | 338 |
339 guarantee(CardsPerRegion == 0, "we should only set it once"); | 339 guarantee(CardsPerRegion == 0, "we should only set it once"); |
340 CardsPerRegion = GrainBytes >> CardTableModRefBS::card_shift; | 340 CardsPerRegion = GrainBytes >> CardTableModRefBS::card_shift; |
341 } | 341 } |
342 | 342 |
480 #ifdef _MSC_VER // the use of 'this' below gets a warning, make it go away | 480 #ifdef _MSC_VER // the use of 'this' below gets a warning, make it go away |
481 #pragma warning( disable:4355 ) // 'this' : used in base member initializer list | 481 #pragma warning( disable:4355 ) // 'this' : used in base member initializer list |
482 #endif // _MSC_VER | 482 #endif // _MSC_VER |
483 | 483 |
484 | 484 |
485 HeapRegion:: | 485 HeapRegion::HeapRegion(uint hrs_index, |
486 HeapRegion(size_t hrs_index, G1BlockOffsetSharedArray* sharedOffsetArray, | 486 G1BlockOffsetSharedArray* sharedOffsetArray, |
487 MemRegion mr, bool is_zeroed) | 487 MemRegion mr, bool is_zeroed) : |
488 : G1OffsetTableContigSpace(sharedOffsetArray, mr, is_zeroed), | 488 G1OffsetTableContigSpace(sharedOffsetArray, mr, is_zeroed), |
489 _hrs_index(hrs_index), | 489 _hrs_index(hrs_index), |
490 _humongous_type(NotHumongous), _humongous_start_region(NULL), | 490 _humongous_type(NotHumongous), _humongous_start_region(NULL), |
491 _in_collection_set(false), | 491 _in_collection_set(false), |
492 _next_in_special_set(NULL), _orig_end(NULL), | 492 _next_in_special_set(NULL), _orig_end(NULL), |
493 _claimed(InitialClaimValue), _evacuation_failed(false), | 493 _claimed(InitialClaimValue), _evacuation_failed(false), |