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

Jump to bottom

8266426: ZHeapIteratorOopClosure does not handle native access properly #3838

Closed
wants to merge 4 commits into from
Closed

8266426: ZHeapIteratorOopClosure does not handle native access properly #3838

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c29dfb0
iterator
albertnetymk Apr 29, 2021
655da25
cld
albertnetymk May 3, 2021
33cd1d6
explicit private
albertnetymk May 4, 2021
ccd50f4
review
albertnetymk May 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
40 changes: 38 additions & 2 deletions src/hotspot/share/gc/z/zHeapIterator.cpp
View file
Open in desktop
Expand Up @@ -27,6 +27,7 @@
#include "gc/shared/gc_globals.hpp"
#include "gc/shared/taskqueue.inline.hpp"
#include "gc/z/zAddress.inline.hpp"
#include "gc/z/zCollectedHeap.hpp"
#include "gc/z/zGlobals.hpp"
#include "gc/z/zGranuleMap.inline.hpp"
#include "gc/z/zHeapIterator.hpp"
Expand Down Expand Up @@ -123,12 +124,14 @@ class ZHeapIteratorRootOopClosure : public OopClosure {
};

template <bool VisitReferents>
class ZHeapIteratorOopClosure : public ClaimMetadataVisitingOopIterateClosure {
class ZHeapIteratorOopClosure : public OopIterateClosure {
private:
const ZHeapIteratorContext& _context;
const oop _base;

oop load_oop(oop* p) {
assert(ZCollectedHeap::heap()->is_in(p), "Should be in heap");

if (VisitReferents) {
return HeapAccess<AS_NO_KEEPALIVE | ON_UNKNOWN_OOP_REF>::oop_load_at(_base, _base->field_offset(p));
}
Expand All @@ -138,7 +141,7 @@ class ZHeapIteratorOopClosure : public ClaimMetadataVisitingOopIterateClosure {

public:
ZHeapIteratorOopClosure(const ZHeapIteratorContext& context, oop base) :
ClaimMetadataVisitingOopIterateClosure(ClassLoaderData::_claim_other),
OopIterateClosure(),
_context(context),
_base(base) {}

Expand All @@ -154,6 +157,39 @@ class ZHeapIteratorOopClosure : public ClaimMetadataVisitingOopIterateClosure {
virtual void do_oop(narrowOop* p) {
ShouldNotReachHere();
}

virtual bool do_metadata() {
return true;
}

virtual void do_klass(Klass* k) {
ClassLoaderData* const cld = k->class_loader_data();
ZHeapIteratorOopClosure::do_cld(cld);
}

virtual void do_cld(ClassLoaderData* cld) {
class NativeAccessClosure : public OopClosure {
private:
const ZHeapIteratorContext& _context;

public:
explicit NativeAccessClosure(const ZHeapIteratorContext& context) :
_context(context) {}

virtual void do_oop(oop* p) {
assert(!ZCollectedHeap::heap()->is_in(p), "Should not be in heap");
const oop obj = NativeAccess<AS_NO_KEEPALIVE>::oop_load(p);
_context.mark_and_push(obj);
}

virtual void do_oop(narrowOop* p) {
ShouldNotReachHere();
}
};

NativeAccessClosure cl(_context);
cld->oops_do(&cl, ClassLoaderData::_claim_other);
}
};

ZHeapIterator::ZHeapIterator(uint nworkers, bool visit_weaks) :
Expand Down