From e1d81c0946364a266a006481a8fbbac24c7e6c6a Mon Sep 17 00:00:00 2001 From: Hao Sun Date: Tue, 23 Dec 2025 08:08:25 +0000 Subject: [PATCH] 8373122: JFR build failure with CDS disabled due to -Werror=unused-function after JDK-8365400 Reviewed-by: mgronlun, jiefu, fandreuzzi --- .../share/jfr/support/jfrClassDefineEvent.cpp | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/hotspot/share/jfr/support/jfrClassDefineEvent.cpp b/src/hotspot/share/jfr/support/jfrClassDefineEvent.cpp index 5bdc0015a2b..e9266ce171a 100644 --- a/src/hotspot/share/jfr/support/jfrClassDefineEvent.cpp +++ b/src/hotspot/share/jfr/support/jfrClassDefineEvent.cpp @@ -125,20 +125,6 @@ static traceid get_source(const InstanceKlass* ik, JavaThread* jt) { return source_id; } -static traceid get_source(const AOTClassLocation* cl, JavaThread* jt) { - assert(cl != nullptr, "invariant"); - assert(!cl->is_modules_image(), "invariant"); - const char* const path = cl->path(); - assert(path != nullptr, "invariant"); - size_t len = strlen(path); - const char* file_type = cl->file_type_string(); - assert(file_type != nullptr, "invariant"); - len += strlen(file_type) + 3; // ":/" + null - char* const url = NEW_RESOURCE_ARRAY_IN_THREAD(jt, char, len); - jio_snprintf(url, len, "%s%s%s", file_type, ":/", path); - return JfrSymbolTable::add(url); -} - static inline void send_event(const InstanceKlass* ik, traceid source_id) { EventClassDefine event; event.set_definedClass(ik); @@ -172,6 +158,20 @@ void JfrClassDefineEvent::on_creation(const InstanceKlass* ik, const ClassFilePa } #if INCLUDE_CDS +static traceid get_source(const AOTClassLocation* cl, JavaThread* jt) { + assert(cl != nullptr, "invariant"); + assert(!cl->is_modules_image(), "invariant"); + const char* const path = cl->path(); + assert(path != nullptr, "invariant"); + size_t len = strlen(path); + const char* file_type = cl->file_type_string(); + assert(file_type != nullptr, "invariant"); + len += strlen(file_type) + 3; // ":/" + null + char* const url = NEW_RESOURCE_ARRAY_IN_THREAD(jt, char, len); + jio_snprintf(url, len, "%s%s%s", file_type, ":/", path); + return JfrSymbolTable::add(url); +} + void JfrClassDefineEvent::on_restoration(const InstanceKlass* ik, JavaThread* jt) { assert(ik != nullptr, "invariant"); assert(ik->trace_id() != 0, "invariant");