Mercurial > hg > graal-compiler
changeset 2367:1abd292f8c38
Merge
author | jwilhelm |
---|---|
date | Tue, 15 Mar 2011 09:07:49 -0700 |
parents | a181f3a124dd (current diff) 1fb790245268 (diff) |
children | dde920245681 |
files | |
diffstat | 2 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp Mon Mar 14 21:52:24 2011 -0700 +++ b/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;
--- a/src/share/vm/runtime/arguments.cpp Mon Mar 14 21:52:24 2011 -0700 +++ b/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,