# HG changeset patch
# User ysr
# Date 1237569592 25200
# Node ID 399d770899eb42032ccc0eaa8fcacacc5ac51564
# Parent  8a97d92b167253d261342b9264cd2b06d88d0c1f
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 8a97d92b1672 -r 399d770899eb src/share/vm/gc_implementation/parNew/parGCAllocBuffer.hpp
--- a/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.hpp	Wed Mar 18 14:20:02 2009 -0700
+++ b/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.hpp	Fri Mar 20 10:19:52 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