From cfecb144b969b889c7e3ec74479a9f8a66c9bc00 Mon Sep 17 00:00:00 2001
From: Gymee <yumeijie@huawei.com>
Date: Wed, 8 Feb 2023 21:09:18 +0800
Subject: [PATCH] Fix stepper over unexpected behavior

Issue: https://gitee.com/openharmony/arkcompiler_toolchain/issues/I6DT84
Signed-off-by: Gymee <yumeijie@huawei.com>
Change-Id: I2171cc46fa0bfc567d54ffd966b592c8a800e79d
---
 tooling/agent/debugger_impl.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tooling/agent/debugger_impl.cpp b/tooling/agent/debugger_impl.cpp
index cbc2ec59..ee8a602b 100644
--- a/tooling/agent/debugger_impl.cpp
+++ b/tooling/agent/debugger_impl.cpp
@@ -1132,7 +1132,8 @@ void DebuggerImpl::UpdateScopeObject(const FrameHandler *frameHandler,
 
 void DebuggerImpl::ClearSingleStepper()
 {
-    if (singleStepper_ != nullptr) {
+    // ClearSingleStepper is originally called from Function::Call, if current depth is 0, then it is safe to reset
+    if (singleStepper_ != nullptr && DebuggerApi::GetStackDepth(vm_) == 0) {
         singleStepper_.reset();
     }
 }
-- 
Gitee