提交 39cad98a 编写于 作者: Y ysr

6642634: Test nsk/regression/b6186200 crashed with SIGSEGV

Summary: Use correct allocation path in expand_and_allocate() so object's mark and p-bits are set as appropriate.
Reviewed-by: jmasa, pbk
上级 5f66c9cd
...@@ -3121,12 +3121,7 @@ ConcurrentMarkSweepGeneration::expand_and_allocate(size_t word_size, ...@@ -3121,12 +3121,7 @@ ConcurrentMarkSweepGeneration::expand_and_allocate(size_t word_size,
if (GCExpandToAllocateDelayMillis > 0) { if (GCExpandToAllocateDelayMillis > 0) {
os::sleep(Thread::current(), GCExpandToAllocateDelayMillis, false); os::sleep(Thread::current(), GCExpandToAllocateDelayMillis, false);
} }
size_t adj_word_sz = CompactibleFreeListSpace::adjustObjectSize(word_size); return have_lock_and_allocate(word_size, tlab);
if (parallel) {
return cmsSpace()->par_allocate(adj_word_sz);
} else {
return cmsSpace()->allocate(adj_word_sz);
}
} }
// YSR: All of this generation expansion/shrinking stuff is an exact copy of // YSR: All of this generation expansion/shrinking stuff is an exact copy of
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册