stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8312293: SIGSEGV in jfr.internal.event.EventWriter.putUncheckedByte after JDK-8312086

Browse Source 
Reviewed-by: egahlin
This commit is contained in:
Markus Grönlund 2023-07-21 12:21:35 +00:00
parent 8cd43bff3c
commit 59f66a3b83
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/hotspot/share/jfr/support/jfrIntrinsics.cpp
View File

@ -71,7 +71,7 @@ void* JfrIntrinsicSupport::write_checkpoint(JavaThread* jt) {
return JfrJavaEventWriter::event_writer(jt);
}
void JfrIntrinsicSupport::return_lease(JavaThread* jt) {
void* JfrIntrinsicSupport::return_lease(JavaThread* jt) {
DEBUG_ONLY(assert_precondition(jt);)
ThreadStateTransition::transition_from_java(jt, _thread_in_native);
assert(jt->jfr_thread_local()->has_java_event_writer(), "invariant");
@ -79,6 +79,7 @@ void JfrIntrinsicSupport::return_lease(JavaThread* jt) {
JfrJavaEventWriter::flush(jt->jfr_thread_local()->java_event_writer(), 0, 0, jt);
assert(jt->jfr_thread_local()->shelved_buffer() == nullptr, "invariant");
ThreadStateTransition::transition_from_native(jt, _thread_in_Java);
return nullptr;
}
void JfrIntrinsicSupport::load_barrier(const Klass* klass) {

2
src/hotspot/share/jfr/support/jfrIntrinsics.hpp
View File

@ -37,7 +37,7 @@
class JfrIntrinsicSupport : AllStatic {
public:
static void* write_checkpoint(JavaThread* jt);
static void return_lease(JavaThread* jt);
static void* return_lease(JavaThread* jt);
static void load_barrier(const Klass* klass);
static address epoch_address();
static address signal_address();