# HG changeset patch
# User brutisso
# Date 1327078892 -3600
# Node ID 57025542827f35faae6e468c05e780dca155d557
# Parent  a8a126788ea036888dae0b8fb537a4a6ff9dbe0e
7131791: G1: Asserts in nightly testing due to 6976060
Summary: Create a handle and fake an object to make sure that we don't loose the memory we just allocated
Reviewed-by: tonyp, stefank

diff -r a8a126788ea0 -r 57025542827f src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
--- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	Thu Jan 19 09:13:58 2012 -0500
+++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	Fri Jan 20 18:01:32 2012 +0100
@@ -1059,8 +1059,14 @@
 
     if (result != NULL) {
       if (g1_policy()->need_to_start_conc_mark("concurrent humongous allocation")) {
-        // We need to release the Heap_lock before we try to call collect
+        // We need to release the Heap_lock before we try to call collect().
+        // The result will not be stored in any object before this method
+        // returns, so the GC might miss it. Thus, we create a handle to the result
+        // and fake an object at that place.
+        CollectedHeap::fill_with_object(result, word_size, false);
+        Handle h((oop)result);
         collect(GCCause::_g1_humongous_allocation);
+        assert(result == (HeapWord*)h(), "Humongous objects should not be moved by collections");
       }
       return result;
     }