Skip to content

Commit

Permalink
8234399: Shenandoah: Cleanup native load barrier
Browse files Browse the repository at this point in the history
Reviewed-by: rkennke
  • Loading branch information
zhengyu123 committed Jan 23, 2020
1 parent c6126d6 commit b1d5bee
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions 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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -260,12 +260,7 @@ oop ShenandoahBarrierSet::load_reference_barrier_native_impl(oop obj, T* load_ad


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


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

0 comments on commit b1d5bee

Please sign in to comment.