Tue, 15 Mar 2011 09:07:49 -0700
Merge
1.1 --- a/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp Mon Mar 14 21:52:24 2011 -0700 1.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp Tue Mar 15 09:07:49 2011 -0700 1.3 @@ -411,7 +411,7 @@ 1.4 template <class T> void PSPromotionManager::process_array_chunk_work( 1.5 oop obj, 1.6 int start, int end) { 1.7 - assert(start < end, "invariant"); 1.8 + assert(start <= end, "invariant"); 1.9 T* const base = (T*)objArrayOop(obj)->base(); 1.10 T* p = base + start; 1.11 T* const chunk_end = base + end;
2.1 --- a/src/share/vm/runtime/arguments.cpp Mon Mar 14 21:52:24 2011 -0700 2.2 +++ b/src/share/vm/runtime/arguments.cpp Tue Mar 15 09:07:49 2011 -0700 2.3 @@ -1668,13 +1668,13 @@ 2.4 } 2.5 2.6 bool Arguments::verify_min_value(intx val, intx min, const char* name) { 2.7 - // Returns true if given value is greater than specified min threshold 2.8 + // Returns true if given value is at least specified min threshold 2.9 // false, otherwise. 2.10 if (val >= min ) { 2.11 return true; 2.12 } 2.13 jio_fprintf(defaultStream::error_stream(), 2.14 - "%s of " INTX_FORMAT " is invalid; must be greater than " INTX_FORMAT "\n", 2.15 + "%s of " INTX_FORMAT " is invalid; must be at least " INTX_FORMAT "\n", 2.16 name, val, min); 2.17 return false; 2.18 } 2.19 @@ -1901,6 +1901,8 @@ 2.20 status = false; 2.21 } 2.22 2.23 + status = status && verify_min_value(ParGCArrayScanChunk, 1, "ParGCArrayScanChunk"); 2.24 + 2.25 #ifndef SERIALGC 2.26 if (UseG1GC) { 2.27 status = status && verify_percentage(InitiatingHeapOccupancyPercent,