Skip to content

Commit cd25bf2

Browse files
author
Markus Grönlund
committed
8259574: SIGSEGV in BFSClosure::closure_impl
Reviewed-by: stefank, egahlin
1 parent d5ca3b3 commit cd25bf2

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

src/hotspot/share/jfr/leakprofiler/chains/bfsClosure.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ void BFSClosure::do_oop(narrowOop* ref) {
229229
}
230230

231231
void BFSClosure::do_root(UnifiedOopRef ref) {
232-
assert(!ref.is_null(), "invariant");
232+
assert(ref.dereference() != NULL, "pointee must not be null");
233233
if (!_edge_queue->is_full()) {
234234
_edge_queue->add(NULL, ref);
235235
}

src/hotspot/share/jfr/leakprofiler/chains/rootSetClosure.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ template <typename Delegate>
5757
void RootSetClosure<Delegate>::do_oop(narrowOop* ref) {
5858
assert(ref != NULL, "invariant");
5959
assert(is_aligned(ref, sizeof(narrowOop)), "invariant");
60-
if (CompressedOops::is_null(*ref)) {
60+
if (!CompressedOops::is_null(*ref)) {
6161
_delegate->do_root(UnifiedOopRef::encode_in_native(ref));
6262
}
6363
}

src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,6 @@ class JavaThreadInVMAndNative : public StackObj {
524524
};
525525

526526
static void post_events(bool exception_handler, Thread* thread) {
527-
DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_vm(thread));
528527
if (exception_handler) {
529528
EventShutdown e;
530529
e.set_reason("VM Error");

0 commit comments

Comments
 (0)