/hg/release/icedtea7-forest-2.3/hotspot: 2 new changesets

[andrew at icedtea.classpath.org]

changeset 87f0aa7a8f8f in /hg/release/icedtea7-forest-2.3/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=87f0aa7a8f8f
author: brutisso
date: Thu Sep 13 21:20:26 2012 +0200

	7197906: BlockOffsetArray::power_to_cards_back() needs to handle > 32 bit shifts
	Reviewed-by: brutisso, johnc, ysr
	Contributed-by: Hal Mo <kungu.mjh at taobao.com>


changeset beecf0b9e760 in /hg/release/icedtea7-forest-2.3/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot?cmd=changeset;node=beecf0b9e760
author: andrew
date: Mon Jan 14 22:25:00 2013 +0000

	Added tag icedtea-2.3.4 for changeset 87f0aa7a8f8f


diffstat:

 .hgtags                                                |  1 +
 src/share/vm/gc_implementation/g1/concurrentMark.cpp   |  2 +-
 src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp |  2 +-
 src/share/vm/memory/blockOffsetTable.hpp               |  2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diffs (44 lines):

diff -r d2d0a106917c -r beecf0b9e760 .hgtags
--- a/.hgtags	Tue Oct 16 21:36:40 2012 +0100
+++ b/.hgtags	Mon Jan 14 22:25:00 2013 +0000
@@ -331,3 +331,4 @@
 c798442fa4c00ad251f6cbe989d32485845bf247 icedtea-2.3.1
 2a413d946cb1acdcbe1110098f79b7a1f267bf75 icedtea-2.3.2
 0885feeea95caa8b92f46234872f0c3839d8850b icedtea-2.3.3
+87f0aa7a8f8f0209148ad0746a3486d9cf16ebaa icedtea-2.3.4
diff -r d2d0a106917c -r beecf0b9e760 src/share/vm/gc_implementation/g1/concurrentMark.cpp
--- a/src/share/vm/gc_implementation/g1/concurrentMark.cpp	Tue Oct 16 21:36:40 2012 +0100
+++ b/src/share/vm/gc_implementation/g1/concurrentMark.cpp	Mon Jan 14 22:25:00 2013 +0000
@@ -116,7 +116,7 @@
 #ifndef PRODUCT
 bool CMBitMapRO::covers(ReservedSpace rs) const {
   // assert(_bm.map() == _virtual_space.low(), "map inconsistency");
-  assert(((size_t)_bm.size() * (size_t)(1 << _shifter)) == _bmWordSize,
+  assert(((size_t)_bm.size() * ((size_t)1 << _shifter)) == _bmWordSize,
          "size inconsistency");
   return _bmStartWord == (HeapWord*)(rs.base()) &&
          _bmWordSize  == rs.size()>>LogHeapWordSize;
diff -r d2d0a106917c -r beecf0b9e760 src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
--- a/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp	Tue Oct 16 21:36:40 2012 +0100
+++ b/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp	Mon Jan 14 22:25:00 2013 +0000
@@ -520,7 +520,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;
 #if SAMPLE_FOR_EVICTION
     assert(_fine_eviction_sample_size == 0
diff -r d2d0a106917c -r beecf0b9e760 src/share/vm/memory/blockOffsetTable.hpp
--- a/src/share/vm/memory/blockOffsetTable.hpp	Tue Oct 16 21:36:40 2012 +0100
+++ b/src/share/vm/memory/blockOffsetTable.hpp	Mon Jan 14 22:25:00 2013 +0000
@@ -289,7 +289,7 @@
   };
 
   static size_t power_to_cards_back(uint i) {
-    return (size_t)(1 << (LogBase * i));
+    return (size_t)1 << (LogBase * i);
   }
   static size_t power_to_words_back(uint i) {
     return power_to_cards_back(i) * N_words;