Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
8234399: Shenandoah: Cleanup native load barrier
- Loading branch information
Showing
with
2 additions
and
8 deletions.
-
+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); |
|
|
} |
|
|
} |
|
|
|