8312293: SIGSEGV in jfr.internal.event.EventWriter.putUncheckedByte a…

…fter JDK-8312086 Reviewed-by: egahlin
openjdk · Jul 21, 2023 · 59f66a3 · 59f66a3 · openjdk-notifier · Jul 21, 2023
1 parent 8cd43bf
commit 59f66a3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/hotspot/share/jfr/support/jfrIntrinsics.cpp b/src/hotspot/share/jfr/support/jfrIntrinsics.cpp
@@ -71,14 +71,15 @@ 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");
   assert(jt->jfr_thread_local()->shelved_buffer() != nullptr, "invariant");
   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) {

diff --git a/src/hotspot/share/jfr/support/jfrIntrinsics.hpp b/src/hotspot/share/jfr/support/jfrIntrinsics.hpp
@@ -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();