Skip to content
Permalink
Browse files
8244821: Shenandoah: disarmed_value is initialized at wrong place
Reviewed-by: shade
  • Loading branch information
zhengyu123 committed May 12, 2020
1 parent a6cdce1 commit 25dcb1f717f0394d1868400388c6f01699f3f4b3
Showing with 2 additions and 1 deletion.
  1. +1 −0 src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp
  2. +1 −1 src/hotspot/share/gc/shenandoah/shenandoahThreadLocalData.hpp
@@ -164,6 +164,7 @@ void ShenandoahBarrierSet::on_thread_attach(Thread *thread) {
if (thread->is_Java_thread()) {
ShenandoahThreadLocalData::set_gc_state(thread, _heap->gc_state());
ShenandoahThreadLocalData::initialize_gclab(thread);
ShenandoahThreadLocalData::set_disarmed_value(thread, ShenandoahCodeRoots::disarmed_value());
}
}

@@ -55,7 +55,7 @@ class ShenandoahThreadLocalData {
_gclab_size(0),
_worker_id(INVALID_WORKER_ID),
_force_satb_flush(false),
_disarmed_value(ShenandoahCodeRoots::disarmed_value()) {
_disarmed_value(0) {

// At least on x86_64, nmethod entry barrier encodes _disarmed_value offset
// in instruction as disp8 immed

0 comments on commit 25dcb1f

Please sign in to comment.