Skip to content
Permalink
Browse files
8269110: ZGC: Remove dead code in zBarrier
Reviewed-by: pliden
  • Loading branch information
Hamlin Li committed Jul 2, 2021
1 parent b0e1867 commit 589f084161645ee513ffcfbbbcd56c0f0cd98ade
Showing with 0 additions and 13 deletions.
  1. +0 −3 src/hotspot/share/gc/z/zBarrier.hpp
  2. +0 −10 src/hotspot/share/gc/z/zBarrier.inline.hpp
@@ -97,10 +97,8 @@ class ZBarrier : public AllStatic {
static oop weak_load_barrier_on_oop_field(volatile oop* p);
static oop weak_load_barrier_on_oop_field_preloaded(volatile oop* p, oop o);
static oop weak_load_barrier_on_weak_oop(oop o);
static oop weak_load_barrier_on_weak_oop_field(volatile oop* p);
static oop weak_load_barrier_on_weak_oop_field_preloaded(volatile oop* p, oop o);
static oop weak_load_barrier_on_phantom_oop(oop o);
static oop weak_load_barrier_on_phantom_oop_field(volatile oop* p);
static oop weak_load_barrier_on_phantom_oop_field_preloaded(volatile oop* p, oop o);

// Is alive barrier
@@ -116,7 +114,6 @@ class ZBarrier : public AllStatic {
// Mark barrier
static void mark_barrier_on_oop_field(volatile oop* p, bool finalizable);
static void mark_barrier_on_oop_array(volatile oop* p, size_t length, bool finalizable);
static void mark_barrier_on_invisible_root_oop_field(oop* p);

// Narrow oop variants, never used.
static oop load_barrier_on_oop_field(volatile narrowOop* p);
@@ -287,11 +287,6 @@ inline oop ZBarrier::weak_load_barrier_on_weak_oop(oop o) {
return weak_load_barrier_on_weak_oop_field_preloaded((oop*)NULL, o);
}

inline oop ZBarrier::weak_load_barrier_on_weak_oop_field(volatile oop* p) {
const oop o = Atomic::load(p);
return weak_load_barrier_on_weak_oop_field_preloaded(p, o);
}

inline oop ZBarrier::weak_load_barrier_on_weak_oop_field_preloaded(volatile oop* p, oop o) {
verify_on_weak(p);

@@ -306,11 +301,6 @@ inline oop ZBarrier::weak_load_barrier_on_phantom_oop(oop o) {
return weak_load_barrier_on_phantom_oop_field_preloaded((oop*)NULL, o);
}

inline oop ZBarrier::weak_load_barrier_on_phantom_oop_field(volatile oop* p) {
const oop o = Atomic::load(p);
return weak_load_barrier_on_phantom_oop_field_preloaded(p, o);
}

inline oop ZBarrier::weak_load_barrier_on_phantom_oop_field_preloaded(volatile oop* p, oop o) {
if (ZResurrection::is_blocked()) {
return barrier<is_good_or_null_fast_path, weak_load_barrier_on_phantom_oop_slow_path>(p, o);

1 comment on commit 589f084

@openjdk-notifier

This comment has been minimized.

Copy link

@openjdk-notifier openjdk-notifier bot commented on 589f084 Jul 2, 2021

Please sign in to comment.