Skip to content

8331735: UpcallLinker::on_exit races with GC when copying frame anchor #3434

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

Closed
gnu-andrew wants to merge 1 commit into from
Closed

8331735: UpcallLinker::on_exit races with GC when copying frame anchor #3434

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
8 changes: 2 additions & 6 deletions src/hotspot/share/prims/universalUpcallHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,21 +131,17 @@ void ProgrammableUpcallHandler::on_exit(OptimizedEntryBlob::FrameData* context)
// restore previous handle block
thread->set_active_handles(context->old_handles);

thread->frame_anchor()->zap();

debug_only(thread->dec_java_call_counter());

thread->frame_anchor()->copy(&context->jfa);

// Old thread-local info. has been restored. We are now back in native code.
ThreadStateTransition::transition_from_java(thread, _thread_in_native);

thread->frame_anchor()->copy(&context->jfa);

// Release handles after we are marked as being in native code again, since this
// operation might block
JNIHandleBlock::release_block(context->new_handles, thread);

assert(!thread->has_pending_exception(), "Upcall can not throw an exception");

if (context->should_detach) {
detach_current_thread();
}
Expand Down