From 21d1e4d8039ecccbf60138ede574e0177ee5550f Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Fri, 23 Aug 2024 09:59:15 +0000
Subject: [PATCH] 8338819: JFR: Internal events causes crash when no other
 events are in use

Reviewed-by: mgronlun, sjohanss
---
 src/hotspot/share/jfr/jni/jfrUpcalls.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/hotspot/share/jfr/jni/jfrUpcalls.cpp b/src/hotspot/share/jfr/jni/jfrUpcalls.cpp
index bb316700ac0..2f1cb7e2d54 100644
--- a/src/hotspot/share/jfr/jni/jfrUpcalls.cpp
+++ b/src/hotspot/share/jfr/jni/jfrUpcalls.cpp
@@ -191,6 +191,10 @@ void JfrUpcalls::new_bytes_eager_instrumentation(jlong trace_id,
 
 bool JfrUpcalls::unhide_internal_types(TRAPS) {
   DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_vm(THREAD));
+  if (!initialize(THREAD)) {
+    log_error(jfr, system)("JfrUpcall could not be initialized.");
+    return false;
+  }
   JavaValue result(T_VOID);
   const Klass* klass = SystemDictionary::resolve_or_fail(jvm_upcalls_class_sym, true, CHECK_false);
   assert(klass != nullptr, "invariant");