From e39a2a6300e2abfda4291db03438128f3268dda7 Mon Sep 17 00:00:00 2001 From: Kangcheng Xu Date: Wed, 14 Jan 2026 11:34:37 -0500 Subject: [PATCH] fix safepoint detection --- src/hotspot/share/opto/loopnode.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/hotspot/share/opto/loopnode.cpp b/src/hotspot/share/opto/loopnode.cpp index bd41644b1c8..52971ca8b5b 100644 --- a/src/hotspot/share/opto/loopnode.cpp +++ b/src/hotspot/share/opto/loopnode.cpp @@ -1872,8 +1872,12 @@ void CountedLoopConverter::LoopStructure::build() { } Node* safepoint = _back_control->in(0)->in(0); - if (_loop->_child != nullptr && safepoint->Opcode() == Op_SafePoint) { - _safepoint = safepoint->as_SafePoint(); + if (_loop->_child != nullptr) { + if (safepoint->Opcode() == Op_SafePoint) { + _safepoint = safepoint->as_SafePoint(); + } else { + _safepoint = nullptr; + } } else { _safepoint = _phase->find_safepoint(_back_control, _head, _loop); }