Author: Vy Nguyen Date: 2025-04-02T10:19:12-04:00 New Revision: 87bebd37ffe08c4911d9636ab09cb1406d7ac677
URL: https://github.com/llvm/llvm-project/commit/87bebd37ffe08c4911d9636ab09cb1406d7ac677 DIFF: https://github.com/llvm/llvm-project/commit/87bebd37ffe08c4911d9636ab09cb1406d7ac677.diff LOG: [LLDB][NFC]Move fields that might be referenced in scope-exit to beginning (#133785) Details: The ScopedDiscpatcher's dtor may reference these fields so we need the fields' dtor to be be invoked *after* the dispatcher's. Added: Modified: lldb/source/Interpreter/CommandInterpreter.cpp Removed: ################################################################################ diff --git a/lldb/source/Interpreter/CommandInterpreter.cpp b/lldb/source/Interpreter/CommandInterpreter.cpp index e0bf5520e16ef..949b1191c28f0 100644 --- a/lldb/source/Interpreter/CommandInterpreter.cpp +++ b/lldb/source/Interpreter/CommandInterpreter.cpp @@ -1886,6 +1886,13 @@ bool CommandInterpreter::HandleCommand(const char *command_line, LazyBool lazy_add_to_history, CommandReturnObject &result, bool force_repeat_command) { + // These are assigned later in the function but they must be declared before + // the ScopedDispatcher object because we need their destructions to occur + // after the dispatcher's dtor call, which may reference them. + // TODO: This function could be refactored? + std::string parsed_command_args; + CommandObject *cmd_obj = nullptr; + telemetry::ScopedDispatcher<telemetry::CommandInfo> helper(&m_debugger); const bool detailed_command_telemetry = telemetry::TelemetryManager::GetInstance() @@ -1896,8 +1903,6 @@ bool CommandInterpreter::HandleCommand(const char *command_line, std::string command_string(command_line); std::string original_command_string(command_string); std::string real_original_command_string(command_string); - std::string parsed_command_args; - CommandObject *cmd_obj = nullptr; helper.DispatchNow([&](lldb_private::telemetry::CommandInfo *info) { info->command_id = command_id; _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
