mirror of
https://github.com/openjdk/jdk.git
synced 2025-09-17 09:34:38 +02:00
6863023: need non-perm oops in code cache for JSR 292
Make a special root-list for those few nmethods which might contain non-perm oops. Reviewed-by: twisti, kvn, never, jmasa, ysr
This commit is contained in:
parent
1cf5b7ae11
commit
e261aecad8
74 changed files with 979 additions and 279 deletions
|
@ -32,3 +32,42 @@ void ObjectToOopClosure::do_object(oop obj) {
|
|||
void VoidClosure::do_void() {
|
||||
ShouldNotCallThis();
|
||||
}
|
||||
|
||||
MarkingCodeBlobClosure::MarkScope::MarkScope(bool activate)
|
||||
: _active(activate)
|
||||
{
|
||||
if (_active) nmethod::oops_do_marking_prologue();
|
||||
}
|
||||
|
||||
MarkingCodeBlobClosure::MarkScope::~MarkScope() {
|
||||
if (_active) nmethod::oops_do_marking_epilogue();
|
||||
}
|
||||
|
||||
void MarkingCodeBlobClosure::do_code_blob(CodeBlob* cb) {
|
||||
if (!cb->is_nmethod()) return;
|
||||
nmethod* nm = (nmethod*) cb;
|
||||
if (!nm->test_set_oops_do_mark()) {
|
||||
NOT_PRODUCT(if (TraceScavenge) nm->print_on(tty, "oops_do, 1st visit\n"));
|
||||
do_newly_marked_nmethod(nm);
|
||||
} else {
|
||||
NOT_PRODUCT(if (TraceScavenge) nm->print_on(tty, "oops_do, skipped on 2nd visit\n"));
|
||||
}
|
||||
}
|
||||
|
||||
void CodeBlobToOopClosure::do_newly_marked_nmethod(CodeBlob* cb) {
|
||||
cb->oops_do(_cl);
|
||||
}
|
||||
|
||||
void CodeBlobToOopClosure::do_code_blob(CodeBlob* cb) {
|
||||
if (!_do_marking) {
|
||||
NOT_PRODUCT(if (TraceScavenge && Verbose && cb->is_nmethod()) ((nmethod*)cb)->print_on(tty, "oops_do, unmarked visit\n"));
|
||||
// This assert won't work, since there are lots of mini-passes
|
||||
// (mostly in debug mode) that co-exist with marking phases.
|
||||
//assert(!(cb->is_nmethod() && ((nmethod*)cb)->test_oops_do_mark()), "found marked nmethod during mark-free phase");
|
||||
cb->oops_do(_cl);
|
||||
} else {
|
||||
MarkingCodeBlobClosure::do_code_blob(cb);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue