Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8283791: Parallel: Remove unnecessary condition in PSKeepAliveClosure #7997

Closed
wants to merge 1 commit into from
+8 −6
Closed

8283791: Parallel: Remove unnecessary condition in PSKeepAliveClosure #7997

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/hotspot/share/gc/parallel/psScavenge.cpp
View file
Original file line number Diff line number Diff line change
@@ -162,13 +162,15 @@ class PSKeepAliveClosure: public OopClosure {
}

template <class T> void do_oop_work(T* p) {
assert (oopDesc::is_oop(RawAccess<IS_NOT_NULL>::oop_load(p)),
"expected an oop while scanning weak refs");
#ifdef ASSERT
// Referent must be non-null and in from-space
oop obj = RawAccess<IS_NOT_NULL>::oop_load(p);
assert(oopDesc::is_oop(obj), "referent must be an oop");
assert(PSScavenge::is_obj_in_young(obj), "must be in young-gen");
assert(!PSScavenge::is_obj_in_to_space(obj), "must be in from-space");
#endif

// Weak refs may be visited more than once.
if (PSScavenge::should_scavenge(p, _to_space)) {
_promotion_manager->copy_and_push_safe_barrier</*promote_immediately=*/false>(p);
}
_promotion_manager->copy_and_push_safe_barrier</*promote_immediately=*/false>(p);
}
virtual void do_oop(oop* p) { PSKeepAliveClosure::do_oop_work(p); }
virtual void do_oop(narrowOop* p) { PSKeepAliveClosure::do_oop_work(p); }