From 931196f1b24942216e5f0bca62823904a60433ff Mon Sep 17 00:00:00 2001
From: stefank <unknown>
Date: Mon, 12 Sep 2011 16:09:50 +0200
Subject: [PATCH] 7021322: assert(object_end <= top()) failed: Object crosses
 promotion LAB boundary Summary: Pass the same object size value to both
 allocate and unallocate_object Reviewed-by: ysr, brutisso

---
 .../parallelScavenge/psPromotionLAB.cpp              | 12 +++++-------
 .../parallelScavenge/psPromotionLAB.hpp              |  2 +-
 .../parallelScavenge/psPromotionManager.cpp          |  4 ++--
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.cpp b/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.cpp
index 3569ed7b6..fc05b2e95 100644
--- a/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.cpp
+++ b/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.cpp
@@ -102,17 +102,15 @@ void PSPromotionLAB::flush() {
   _state = flushed;
 }
 
-bool PSPromotionLAB::unallocate_object(oop obj) {
+bool PSPromotionLAB::unallocate_object(HeapWord* obj, size_t obj_size) {
   assert(Universe::heap()->is_in(obj), "Object outside heap");
 
   if (contains(obj)) {
-    HeapWord* object_end = (HeapWord*)obj + obj->size();
-    assert(object_end <= top(), "Object crosses promotion LAB boundary");
+    HeapWord* object_end = obj + obj_size;
+    assert(object_end == top(), "Not matching last allocation");
 
-    if (object_end == top()) {
-      set_top((HeapWord*)obj);
-      return true;
-    }
+    set_top(obj);
+    return true;
   }
 
   return false;
diff --git a/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.hpp b/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.hpp
index bed0c0cde..fd6a7bf56 100644
--- a/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.hpp
+++ b/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.hpp
@@ -73,7 +73,7 @@ class PSPromotionLAB : public CHeapObj {
 
   bool is_flushed()                  { return _state == flushed; }
 
-  bool unallocate_object(oop obj);
+  bool unallocate_object(HeapWord* obj, size_t obj_size);
 
   // Returns a subregion containing all objects in this space.
   MemRegion used_region()            { return MemRegion(bottom(), top()); }
diff --git a/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp b/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp
index ad58a90fc..255bb8ee8 100644
--- a/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp
+++ b/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp
@@ -380,10 +380,10 @@ oop PSPromotionManager::copy_to_survivor_space(oop o) {
       // deallocate it, so we have to test.  If the deallocation fails,
       // overwrite with a filler object.
       if (new_obj_is_tenured) {
-        if (!_old_lab.unallocate_object(new_obj)) {
+        if (!_old_lab.unallocate_object((HeapWord*) new_obj, new_obj_size)) {
           CollectedHeap::fill_with_object((HeapWord*) new_obj, new_obj_size);
         }
-      } else if (!_young_lab.unallocate_object(new_obj)) {
+      } else if (!_young_lab.unallocate_object((HeapWord*) new_obj, new_obj_size)) {
         CollectedHeap::fill_with_object((HeapWord*) new_obj, new_obj_size);
       }
 
-- 
GitLab