Mercurial > hg > truffle
diff src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp @ 6948:e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 12 Nov 2012 23:14:12 +0100 |
parents | 859cd1a76f8a |
children | 6f817ce50129 5c93c1f61226 |
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp Mon Nov 12 18:11:17 2012 +0100 +++ b/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp Mon Nov 12 23:14:12 2012 +0100 @@ -273,7 +273,7 @@ if (_max_fine_entries == 0) { assert(_mod_max_fine_entries_mask == 0, "Both or none."); size_t max_entries_log = (size_t)log2_long((jlong)G1RSetRegionEntries); - _max_fine_entries = (size_t)(1 << max_entries_log); + _max_fine_entries = (size_t)1 << max_entries_log; _mod_max_fine_entries_mask = _max_fine_entries - 1; assert(_fine_eviction_sample_size == 0