Skip to content

Commit e1d81c0

Browse files
author
Hao Sun
committed
8373122: JFR build failure with CDS disabled due to -Werror=unused-function after JDK-8365400
Reviewed-by: mgronlun, jiefu, fandreuzzi
1 parent a0094f5 commit e1d81c0

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

src/hotspot/share/jfr/support/jfrClassDefineEvent.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -125,20 +125,6 @@ static traceid get_source(const InstanceKlass* ik, JavaThread* jt) {
125125
return source_id;
126126
}
127127

128-
static traceid get_source(const AOTClassLocation* cl, JavaThread* jt) {
129-
assert(cl != nullptr, "invariant");
130-
assert(!cl->is_modules_image(), "invariant");
131-
const char* const path = cl->path();
132-
assert(path != nullptr, "invariant");
133-
size_t len = strlen(path);
134-
const char* file_type = cl->file_type_string();
135-
assert(file_type != nullptr, "invariant");
136-
len += strlen(file_type) + 3; // ":/" + null
137-
char* const url = NEW_RESOURCE_ARRAY_IN_THREAD(jt, char, len);
138-
jio_snprintf(url, len, "%s%s%s", file_type, ":/", path);
139-
return JfrSymbolTable::add(url);
140-
}
141-
142128
static inline void send_event(const InstanceKlass* ik, traceid source_id) {
143129
EventClassDefine event;
144130
event.set_definedClass(ik);
@@ -172,6 +158,20 @@ void JfrClassDefineEvent::on_creation(const InstanceKlass* ik, const ClassFilePa
172158
}
173159

174160
#if INCLUDE_CDS
161+
static traceid get_source(const AOTClassLocation* cl, JavaThread* jt) {
162+
assert(cl != nullptr, "invariant");
163+
assert(!cl->is_modules_image(), "invariant");
164+
const char* const path = cl->path();
165+
assert(path != nullptr, "invariant");
166+
size_t len = strlen(path);
167+
const char* file_type = cl->file_type_string();
168+
assert(file_type != nullptr, "invariant");
169+
len += strlen(file_type) + 3; // ":/" + null
170+
char* const url = NEW_RESOURCE_ARRAY_IN_THREAD(jt, char, len);
171+
jio_snprintf(url, len, "%s%s%s", file_type, ":/", path);
172+
return JfrSymbolTable::add(url);
173+
}
174+
175175
void JfrClassDefineEvent::on_restoration(const InstanceKlass* ik, JavaThread* jt) {
176176
assert(ik != nullptr, "invariant");
177177
assert(ik->trace_id() != 0, "invariant");

0 commit comments

Comments
 (0)