# HG changeset patch
# User jwilhelm
# Date 1300205269 25200
# Node ID fd6f55561f34a6c3b321e0e12c10b8235f684b77
# Parent  7ebbd0b3e2951d8f9fc0cfffb55004ed0cb46f38# Parent  f8edcc58cca793af7c6da1f55fb3c0a5376bd5fc
Merge

diff -r 7ebbd0b3e295 -r fd6f55561f34 hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp	Mon Mar 14 21:52:24 2011 -0700
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp	Tue Mar 15 09:07:49 2011 -0700
@@ -411,7 +411,7 @@
 template <class T> void PSPromotionManager::process_array_chunk_work(
                                                  oop obj,
                                                  int start, int end) {
-  assert(start < end, "invariant");
+  assert(start <= end, "invariant");
   T* const base      = (T*)objArrayOop(obj)->base();
   T* p               = base + start;
   T* const chunk_end = base + end;
diff -r 7ebbd0b3e295 -r fd6f55561f34 hotspot/src/share/vm/runtime/arguments.cpp
--- a/hotspot/src/share/vm/runtime/arguments.cpp	Mon Mar 14 21:52:24 2011 -0700
+++ b/hotspot/src/share/vm/runtime/arguments.cpp	Tue Mar 15 09:07:49 2011 -0700
@@ -1668,13 +1668,13 @@
 }
 
 bool Arguments::verify_min_value(intx val, intx min, const char* name) {
-  // Returns true if given value is greater than specified min threshold
+  // Returns true if given value is at least specified min threshold
   // false, otherwise.
   if (val >= min ) {
       return true;
   }
   jio_fprintf(defaultStream::error_stream(),
-              "%s of " INTX_FORMAT " is invalid; must be greater than " INTX_FORMAT "\n",
+              "%s of " INTX_FORMAT " is invalid; must be at least " INTX_FORMAT "\n",
               name, val, min);
   return false;
 }
@@ -1901,6 +1901,8 @@
     status = false;
   }
 
+  status = status && verify_min_value(ParGCArrayScanChunk, 1, "ParGCArrayScanChunk");
+
 #ifndef SERIALGC
   if (UseG1GC) {
     status = status && verify_percentage(InitiatingHeapOccupancyPercent,