Skip to content
Permalink
Browse files

8234399: Shenandoah: Cleanup native load barrier

Reviewed-by: rkennke
  • Loading branch information
zhengyu123 committed Jan 23, 2020
1 parent c6126d6 commit b1d5bee8ca96cb63d93e1a97108c3ce909611cc7
Showing with 2 additions and 8 deletions.
  1. +2 −8 src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2019, Red Hat, Inc. All rights reserved.
* Copyright (c) 2013, 2020, Red Hat, Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -260,12 +260,7 @@ oop ShenandoahBarrierSet::load_reference_barrier_native_impl(oop obj, T* load_ad

ShenandoahMarkingContext* const marking_context = _heap->marking_context();
if (_heap->is_concurrent_root_in_progress() && !marking_context->is_marked(obj)) {
Thread* thr = Thread::current();
if (thr->is_Java_thread()) {
return NULL;
} else {
return obj;
}
return NULL;
}

oop fwd = load_reference_barrier_not_null(obj);
@@ -282,4 +277,3 @@ void ShenandoahBarrierSet::clone_barrier_runtime(oop src) {
clone_barrier(src);
}
}

0 comments on commit b1d5bee

Please sign in to comment.