# HG changeset patch
# User ysr
# Date 1236977761 25200
# Node ID 09f82af55c3eb537afd1478711c48f6d77caeeda
# Parent  ec1a6dc46005b63af25da36c776c545e6f6d8482
6808322: ParNew, CMS, G1: ParGCAllocBuffer overflow
Summary: Correct the overflow check in ParGCAllocBuffer::allocate(); simplify ParGCAllocBuffer::undo_allocation().
Reviewed-by: apetrusenko, jcoomes, jmasa, minqi, phh, tonyp

diff -r ec1a6dc46005 -r 09f82af55c3e src/share/vm/gc_implementation/parNew/parGCAllocBuffer.hpp
--- a/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.hpp	Thu Mar 12 14:01:36 2009 -0700
+++ b/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.hpp	Fri Mar 13 13:56:01 2009 -0700
@@ -63,9 +63,8 @@
   // return NULL.
   HeapWord* allocate(size_t word_sz) {
     HeapWord* res = _top;
-    HeapWord* new_top = _top + word_sz;
-    if (new_top <= _end) {
-      _top = new_top;
+    if (pointer_delta(_end, _top) >= word_sz) {
+      _top = _top + word_sz;
       return res;
     } else {
       return NULL;
@@ -75,10 +74,9 @@
   // Undo the last allocation in the buffer, which is required to be of the
   // "obj" of the given "word_sz".
   void undo_allocation(HeapWord* obj, size_t word_sz) {
-    assert(_top - word_sz >= _bottom
-           && _top - word_sz == obj,
-           "Bad undo_allocation");
-    _top = _top - word_sz;
+    assert(pointer_delta(_top, _bottom) >= word_sz, "Bad undo");
+    assert(pointer_delta(_top, obj)     == word_sz, "Bad undo");
+    _top = obj;
   }
 
   // The total (word) size of the buffer, including both allocated and