infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-04 13:10:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

8225706: JFR RootResolver resets CLD claims with no restore

Browse Source 
Reviewed-by: zgu, egahlin
This commit is contained in:
Markus Grönlund 2019-07-02 14:31:43 +02:00
parent a8842c9f59
commit 6e16ff4cea
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hotspot/share/jfr/leakprofiler/chains/rootSetClosure.cpp
View File

@ -30,7 +30,6 @@
#include "gc/shared/strongRootsScope.hpp"
#include "jfr/leakprofiler/chains/edgeQueue.hpp"
#include "jfr/leakprofiler/chains/rootSetClosure.hpp"
#include "jfr/leakprofiler/utilities/saveRestore.hpp"
#include "jfr/leakprofiler/utilities/unifiedOop.hpp"
#include "memory/universe.hpp"
#include "oops/access.inline.hpp"
@ -92,10 +91,9 @@ class RootSetClosureMarkScope : public MarkScope {
};
void RootSetClosure::process_roots(OopClosure* closure) {
SaveRestoreCLDClaimBits save_restore_cld_claim_bits;
RootSetClosureMarkScope mark_scope;
CLDToOopClosure cldt_closure(closure, ClassLoaderData::_claim_strong);
CLDToOopClosure cldt_closure(closure, ClassLoaderData::_claim_none);
ClassLoaderDataGraph::always_strong_cld_do(&cldt_closure);
CodeBlobToOopClosure blobs(closure, false);
Threads::oops_do(closure, &blobs);

5
src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.cpp
View File

@ -132,7 +132,7 @@ class ReferenceToRootClosure : public StackObj {
bool ReferenceToRootClosure::do_cldg_roots() {
assert(!complete(), "invariant");
ReferenceLocateClosure rlc(_callback, OldObjectRoot::_class_loader_data, OldObjectRoot::_type_undetermined, NULL);
CLDToOopClosure cldt_closure(&rlc, ClassLoaderData::_claim_strong);
CLDToOopClosure cldt_closure(&rlc, ClassLoaderData::_claim_none);
ClassLoaderDataGraph::always_strong_cld_do(&cldt_closure);
return rlc.complete();
}
@ -435,9 +435,6 @@ class RootResolverMarkScope : public MarkScope {
};
void RootResolver::resolve(RootCallback& callback) {
// Need to clear cld claim bit before starting
ClassLoaderDataGraph::clear_claimed_marks();
RootResolverMarkScope mark_scope;
// thread local roots