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

8342105: JVM Crash when Jacoco and JFR are active

Browse Source 
Reviewed-by: egahlin
This commit is contained in:
Markus Grönlund 2024-11-11 14:36:30 +00:00
parent babb52a083
commit 0759224edc
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/hotspot/share/jfr/support/jfrDeprecationManager.cpp
View File

@ -24,6 +24,7 @@
#include "precompiled.hpp" #include "precompiled.hpp"
#include "classfile/moduleEntry.hpp" #include "classfile/moduleEntry.hpp"
#include "interpreter/bytecodes.hpp"
#include "jfrfiles/jfrEventIds.hpp" #include "jfrfiles/jfrEventIds.hpp"
#include "jfr/jni/jfrJavaSupport.hpp" #include "jfr/jni/jfrJavaSupport.hpp"
#include "jfr/recorder/jfrRecorder.hpp" #include "jfr/recorder/jfrRecorder.hpp"
@ -216,6 +217,25 @@ static bool should_record(const Method* method, const Method* sender, JavaThread
return is_not_jdk_module(sender_module, jt) && max_limit_not_reached(); return is_not_jdk_module(sender_module, jt) && max_limit_not_reached();
} }
static inline bool is_invoke_bytecode(const Method* sender, int bci) {
assert(sender != nullptr, "invariant");
assert(sender->validate_bci(bci) >= 0, "invariant");
const Bytecodes::Code bc = (Bytecodes::Code)*sender->bcp_from(bci);
switch (bc) {
case Bytecodes::_invokevirtual:
case Bytecodes::_invokestatic:
case Bytecodes::_invokeinterface:
case Bytecodes::_invokespecial:
case Bytecodes::_invokedynamic: {
return true;
}
default: {
return false;
}
}
return false;
}
// This is the entry point for newly discovered edges in JfrResolution.cpp. // This is the entry point for newly discovered edges in JfrResolution.cpp.
void JfrDeprecationManager::on_link(const Method* method, Method* sender, int bci, u1 frame_type, JavaThread* jt) { void JfrDeprecationManager::on_link(const Method* method, Method* sender, int bci, u1 frame_type, JavaThread* jt) {
assert(method != nullptr, "invariant"); assert(method != nullptr, "invariant");
@ -224,10 +244,13 @@ void JfrDeprecationManager::on_link(const Method* method, Method* sender, int bc
assert(!sender->is_native(), "invariant"); assert(!sender->is_native(), "invariant");
assert(jt != nullptr, "invariant"); assert(jt != nullptr, "invariant");
assert(JfrRecorder::is_started_on_commandline(), "invariant"); assert(JfrRecorder::is_started_on_commandline(), "invariant");
if (JfrMethodData::mark_deprecated_call_site(sender, bci, jt)) { if (should_record(method, sender, jt)) {
if (should_record(method, sender, jt)) { if (is_invoke_bytecode(sender, bci)) {
create_edge(method, sender, bci, frame_type, jt); if (!JfrMethodData::mark_deprecated_call_site(sender, bci, jt)) {
return;
}
} }
create_edge(method, sender, bci, frame_type, jt);
} }
} }