From: Dave Lee Date: Tue, 14 Feb 2023 21:39:56 +0000 (-0800) Subject: [lldb] Rename SetResultIsInternal to SetSuppressPersistentResult (NFC) X-Git-Tag: upstream/17.0.6~17193 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b3215c8106170e586c59cc66a118329108cb72a4;p=platform%2Fupstream%2Fllvm.git [lldb] Rename SetResultIsInternal to SetSuppressPersistentResult (NFC) Rename `SetResultIsInternal` and `GetResultIsInternal` to `SetSuppressPersistentResult` and `GetSuppressPersistentResult` respectively. Also rename `m_result_is_internal`. This matches the naming in the SB API. A separate change calls `SetSuppressPersistentResult`, where the name `SetResultIsInternal` doesn't quite fit. Differential Revision: https://reviews.llvm.org/D144042 --- diff --git a/lldb/include/lldb/Target/Target.h b/lldb/include/lldb/Target/Target.h index 09fbf45..5c6e4fe 100644 --- a/lldb/include/lldb/Target/Target.h +++ b/lldb/include/lldb/Target/Target.h @@ -413,9 +413,11 @@ public: uint32_t GetPoundLineLine() const { return m_pound_line_line; } - void SetResultIsInternal(bool b) { m_result_is_internal = b; } + void SetSuppressPersistentResult(bool b) { m_suppress_persistent_result = b; } - bool GetResultIsInternal() const { return m_result_is_internal; } + bool GetSuppressPersistentResult() const { + return m_suppress_persistent_result; + } void SetAutoApplyFixIts(bool b) { m_auto_apply_fixits = b; } @@ -446,7 +448,7 @@ private: bool m_repl = false; bool m_generate_debug_info = false; bool m_ansi_color_errors = false; - bool m_result_is_internal = false; + bool m_suppress_persistent_result = false; bool m_auto_apply_fixits = true; uint64_t m_retries_with_fixits = 1; /// True if the executed code should be treated as utility code that is only diff --git a/lldb/source/API/SBExpressionOptions.cpp b/lldb/source/API/SBExpressionOptions.cpp index 6ae57f2..5f1d8d9 100644 --- a/lldb/source/API/SBExpressionOptions.cpp +++ b/lldb/source/API/SBExpressionOptions.cpp @@ -178,13 +178,13 @@ void SBExpressionOptions::SetGenerateDebugInfo(bool b) { bool SBExpressionOptions::GetSuppressPersistentResult() { LLDB_INSTRUMENT_VA(this); - return m_opaque_up->GetResultIsInternal(); + return m_opaque_up->GetSuppressPersistentResult(); } void SBExpressionOptions::SetSuppressPersistentResult(bool b) { LLDB_INSTRUMENT_VA(this, b); - return m_opaque_up->SetResultIsInternal(b); + return m_opaque_up->SetSuppressPersistentResult(b); } const char *SBExpressionOptions::GetPrefix() const { diff --git a/lldb/source/Breakpoint/BreakpointLocation.cpp b/lldb/source/Breakpoint/BreakpointLocation.cpp index 0ee8bcf..3ead1ec 100644 --- a/lldb/source/Breakpoint/BreakpointLocation.cpp +++ b/lldb/source/Breakpoint/BreakpointLocation.cpp @@ -290,7 +290,7 @@ bool BreakpointLocation::ConditionSaysStop(ExecutionContext &exe_ctx, options.SetUnwindOnError(true); options.SetIgnoreBreakpoints(true); options.SetTryAllThreads(true); - options.SetResultIsInternal( + options.SetSuppressPersistentResult( true); // Don't generate a user variable for condition expressions. Status expr_error; diff --git a/lldb/source/Expression/UserExpression.cpp b/lldb/source/Expression/UserExpression.cpp index c1515b0..0c2d159 100644 --- a/lldb/source/Expression/UserExpression.cpp +++ b/lldb/source/Expression/UserExpression.cpp @@ -424,7 +424,7 @@ UserExpression::Execute(DiagnosticManager &diagnostic_manager, lldb::ExpressionResults expr_result = DoExecute( diagnostic_manager, exe_ctx, options, shared_ptr_to_me, result_var); Target *target = exe_ctx.GetTargetPtr(); - if (options.GetResultIsInternal() && result_var && target) { + if (options.GetSuppressPersistentResult() && result_var && target) { if (auto *persistent_state = target->GetPersistentExpressionStateForLanguage(m_language)) persistent_state->RemovePersistentVariable(result_var);