1.1 --- a/src/share/vm/gc_implementation/g1/heapRegionSeq.inline.hpp Wed Apr 11 16:18:45 2012 +0200
1.2 +++ b/src/share/vm/gc_implementation/g1/heapRegionSeq.inline.hpp Wed Apr 18 07:21:15 2012 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -28,11 +28,11 @@
1.11 #include "gc_implementation/g1/heapRegion.hpp"
1.12 #include "gc_implementation/g1/heapRegionSeq.hpp"
1.13
1.14 -inline size_t HeapRegionSeq::addr_to_index_biased(HeapWord* addr) const {
1.15 +inline uintx HeapRegionSeq::addr_to_index_biased(HeapWord* addr) const {
1.16 assert(_heap_bottom <= addr && addr < _heap_end,
1.17 err_msg("addr: "PTR_FORMAT" bottom: "PTR_FORMAT" end: "PTR_FORMAT,
1.18 addr, _heap_bottom, _heap_end));
1.19 - size_t index = (size_t) addr >> _region_shift;
1.20 + uintx index = (uintx) addr >> _region_shift;
1.21 return index;
1.22 }
1.23
1.24 @@ -40,7 +40,7 @@
1.25 assert(_heap_bottom <= addr && addr < _heap_end,
1.26 err_msg("addr: "PTR_FORMAT" bottom: "PTR_FORMAT" end: "PTR_FORMAT,
1.27 addr, _heap_bottom, _heap_end));
1.28 - size_t index_biased = addr_to_index_biased(addr);
1.29 + uintx index_biased = addr_to_index_biased(addr);
1.30 HeapRegion* hr = _regions_biased[index_biased];
1.31 assert(hr != NULL, "invariant");
1.32 return hr;
1.33 @@ -55,7 +55,7 @@
1.34 return NULL;
1.35 }
1.36
1.37 -inline HeapRegion* HeapRegionSeq::at(size_t index) const {
1.38 +inline HeapRegion* HeapRegionSeq::at(uint index) const {
1.39 assert(index < length(), "pre-condition");
1.40 HeapRegion* hr = _regions[index];
1.41 assert(hr != NULL, "sanity");
