diff --git a/ecmascript/tooling/agent/debugger_impl.cpp b/ecmascript/tooling/agent/debugger_impl.cpp index f7e064b665578f48494334ce5322b4b591845914..d46f146100ba0584fe59df428a348d2ecd67b1fd 100644 --- a/ecmascript/tooling/agent/debugger_impl.cpp +++ b/ecmascript/tooling/agent/debugger_impl.cpp @@ -1073,7 +1073,10 @@ std::optional DebuggerImpl::CmptEvaluateValue(CallFrameId callFrame if (value.IsEmpty()) { return "Unsupported expression."; } + JsDebuggerManager *mgr = vm_->GetJsDebuggerManager(); + mgr->SetEvalFrameHandler(callFrameHandlers_[callFrameId]); bool ret = DebuggerExecutor::SetValue(vm_, frameHandler, name, value); + mgr->SetEvalFrameHandler(nullptr); if (ret) { *result = RemoteObject::FromTagged(vm_, value); return {};