提交 9b3f1ad9 编写于 作者: B brutisso

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
上级 3de8d495
...@@ -1059,8 +1059,14 @@ HeapWord* G1CollectedHeap::attempt_allocation_humongous(size_t word_size, ...@@ -1059,8 +1059,14 @@ HeapWord* G1CollectedHeap::attempt_allocation_humongous(size_t word_size,
if (result != NULL) { if (result != NULL) {
if (g1_policy()->need_to_start_conc_mark("concurrent humongous allocation")) { 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); collect(GCCause::_g1_humongous_allocation);
assert(result == (HeapWord*)h(), "Humongous objects should not be moved by collections");
} }
return result; return result;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册