OpenJDK / jdk / jdk
changeset 57842:e7c4199e4d32
8237874: Shenandoah: Backout JDK-8234399
Reviewed-by: shade
| author | zgu |
|---|---|
| date | Mon, 27 Jan 2020 09:58:27 -0500 |
| parents | 5d49b846aef7 |
| children | d8a226ce60cc |
| files | src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp |
| diffstat | 1 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp Mon Jan 27 09:39:44 2020 -0800 +++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp Mon Jan 27 09:58:27 2020 -0500 @@ -260,7 +260,12 @@ ShenandoahMarkingContext* const marking_context = _heap->marking_context(); if (_heap->is_concurrent_root_in_progress() && !marking_context->is_marked(obj)) { - return NULL; + Thread* thr = Thread::current(); + if (thr->is_Java_thread()) { + return NULL; + } else { + return obj; + } } oop fwd = load_reference_barrier_not_null(obj); @@ -277,3 +282,4 @@ clone_barrier(src); } } +