diff options
Diffstat (limited to 'lldb/source/Commands')
-rw-r--r-- | lldb/source/Commands/CommandObjectBreakpoint.cpp | 2 | ||||
-rw-r--r-- | lldb/source/Commands/CommandObjectCommands.cpp | 4 | ||||
-rw-r--r-- | lldb/source/Commands/CommandObjectFrame.cpp | 8 | ||||
-rw-r--r-- | lldb/source/Commands/CommandObjectMemory.cpp | 22 | ||||
-rw-r--r-- | lldb/source/Commands/CommandObjectMultiword.cpp | 4 | ||||
-rw-r--r-- | lldb/source/Commands/CommandObjectProcess.cpp | 4 | ||||
-rw-r--r-- | lldb/source/Commands/CommandObjectSource.cpp | 4 | ||||
-rw-r--r-- | lldb/source/Commands/CommandObjectThread.cpp | 18 |
8 files changed, 33 insertions, 33 deletions
diff --git a/lldb/source/Commands/CommandObjectBreakpoint.cpp b/lldb/source/Commands/CommandObjectBreakpoint.cpp index 8665a44..2680c11 100644 --- a/lldb/source/Commands/CommandObjectBreakpoint.cpp +++ b/lldb/source/Commands/CommandObjectBreakpoint.cpp @@ -2205,7 +2205,7 @@ public: break; case 'N': - llvm::Optional<FileSpec> file_spec; + std::optional<FileSpec> file_spec; const llvm::StringRef dash_f("-f"); for (int arg_idx = 0; arg_idx < opt_arg_pos; arg_idx++) { if (dash_f == request.GetParsedLine().GetArgumentAtIndex(arg_idx)) { diff --git a/lldb/source/Commands/CommandObjectCommands.cpp b/lldb/source/Commands/CommandObjectCommands.cpp index 5f9d699..6f3b292 100644 --- a/lldb/source/Commands/CommandObjectCommands.cpp +++ b/lldb/source/Commands/CommandObjectCommands.cpp @@ -58,8 +58,8 @@ public: ~CommandObjectCommandsSource() override = default; - llvm::Optional<std::string> GetRepeatCommand(Args ¤t_command_args, - uint32_t index) override { + std::optional<std::string> GetRepeatCommand(Args ¤t_command_args, + uint32_t index) override { return std::string(""); } diff --git a/lldb/source/Commands/CommandObjectFrame.cpp b/lldb/source/Commands/CommandObjectFrame.cpp index 29d5c23..af0f94a 100644 --- a/lldb/source/Commands/CommandObjectFrame.cpp +++ b/lldb/source/Commands/CommandObjectFrame.cpp @@ -100,9 +100,9 @@ public: } // Options. - llvm::Optional<lldb::addr_t> address; - llvm::Optional<ConstString> reg; - llvm::Optional<int64_t> offset; + std::optional<lldb::addr_t> address; + std::optional<ConstString> reg; + std::optional<int64_t> offset; }; CommandObjectFrameDiagnose(CommandInterpreter &interpreter) @@ -257,7 +257,7 @@ public: return llvm::makeArrayRef(g_frame_select_options); } - llvm::Optional<int32_t> relative_frame_offset; + std::optional<int32_t> relative_frame_offset; }; CommandObjectFrameSelect(CommandInterpreter &interpreter) diff --git a/lldb/source/Commands/CommandObjectMemory.cpp b/lldb/source/Commands/CommandObjectMemory.cpp index fa0c96f..78ee647 100644 --- a/lldb/source/Commands/CommandObjectMemory.cpp +++ b/lldb/source/Commands/CommandObjectMemory.cpp @@ -342,8 +342,8 @@ public: Options *GetOptions() override { return &m_option_group; } - llvm::Optional<std::string> GetRepeatCommand(Args ¤t_command_args, - uint32_t index) override { + std::optional<std::string> GetRepeatCommand(Args ¤t_command_args, + uint32_t index) override { return m_cmd_name; } @@ -477,7 +477,7 @@ protected: for (auto lang : languages_to_check) { if (auto *persistent_vars = target->GetPersistentExpressionStateForLanguage(lang)) { - if (llvm::Optional<CompilerType> type = + if (std::optional<CompilerType> type = persistent_vars->GetCompilerTypeFromPersistentDecl( lookup_type_name)) { user_defined_types.emplace(*type); @@ -522,7 +522,7 @@ protected: --pointer_count; } - llvm::Optional<uint64_t> size = compiler_type.GetByteSize(nullptr); + std::optional<uint64_t> size = compiler_type.GetByteSize(nullptr); if (!size) { result.AppendErrorWithFormat( "unable to get the byte size of the type '%s'\n", @@ -651,7 +651,7 @@ protected: if (!m_format_options.GetFormatValue().OptionWasSet()) m_format_options.GetFormatValue().SetCurrentValue(eFormatDefault); - llvm::Optional<uint64_t> size = compiler_type.GetByteSize(nullptr); + std::optional<uint64_t> size = compiler_type.GetByteSize(nullptr); if (!size) { result.AppendError("can't get size of type"); return false; @@ -1076,7 +1076,7 @@ protected: m_memory_options.m_expr.GetStringValue(), frame, result_sp)) && result_sp) { uint64_t value = result_sp->GetValueAsUnsigned(0); - llvm::Optional<uint64_t> size = + std::optional<uint64_t> size = result_sp->GetCompilerType().GetByteSize(nullptr); if (!size) return false; @@ -1601,8 +1601,8 @@ public: ~CommandObjectMemoryHistory() override = default; - llvm::Optional<std::string> GetRepeatCommand(Args ¤t_command_args, - uint32_t index) override { + std::optional<std::string> GetRepeatCommand(Args ¤t_command_args, + uint32_t index) override { return m_cmd_name; } @@ -1737,7 +1737,7 @@ protected: if (memory_tagged == MemoryRegionInfo::OptionalBool::eYes) result.AppendMessage("memory tagging: enabled"); - const llvm::Optional<std::vector<addr_t>> &dirty_page_list = + const std::optional<std::vector<addr_t>> &dirty_page_list = range_info.GetDirtyPageList(); if (dirty_page_list) { const size_t page_count = dirty_page_list->size(); @@ -1852,8 +1852,8 @@ protected: return false; } - llvm::Optional<std::string> GetRepeatCommand(Args ¤t_command_args, - uint32_t index) override { + std::optional<std::string> GetRepeatCommand(Args ¤t_command_args, + uint32_t index) override { // If we repeat this command, repeat it without any arguments so we can // show the next memory range return m_cmd_name; diff --git a/lldb/source/Commands/CommandObjectMultiword.cpp b/lldb/source/Commands/CommandObjectMultiword.cpp index 80682b0..6bcf0de 100644 --- a/lldb/source/Commands/CommandObjectMultiword.cpp +++ b/lldb/source/Commands/CommandObjectMultiword.cpp @@ -291,7 +291,7 @@ void CommandObjectMultiword::HandleCompletion(CompletionRequest &request) { sub_command_object->HandleCompletion(request); } -llvm::Optional<std::string> +std::optional<std::string> CommandObjectMultiword::GetRepeatCommand(Args ¤t_command_args, uint32_t index) { index++; @@ -421,7 +421,7 @@ void CommandObjectProxy::HandleArgumentCompletion( proxy_command->HandleArgumentCompletion(request, opt_element_vector); } -llvm::Optional<std::string> +std::optional<std::string> CommandObjectProxy::GetRepeatCommand(Args ¤t_command_args, uint32_t index) { CommandObject *proxy_command = GetProxyCommandObject(); diff --git a/lldb/source/Commands/CommandObjectProcess.cpp b/lldb/source/Commands/CommandObjectProcess.cpp index 66a90d5a..3532948 100644 --- a/lldb/source/Commands/CommandObjectProcess.cpp +++ b/lldb/source/Commands/CommandObjectProcess.cpp @@ -152,8 +152,8 @@ public: Options *GetOptions() override { return &m_all_options; } - llvm::Optional<std::string> GetRepeatCommand(Args ¤t_command_args, - uint32_t index) override { + std::optional<std::string> GetRepeatCommand(Args ¤t_command_args, + uint32_t index) override { // No repeat for "process launch"... return std::string(""); } diff --git a/lldb/source/Commands/CommandObjectSource.cpp b/lldb/source/Commands/CommandObjectSource.cpp index 2c84e6f..049b02b 100644 --- a/lldb/source/Commands/CommandObjectSource.cpp +++ b/lldb/source/Commands/CommandObjectSource.cpp @@ -722,8 +722,8 @@ public: Options *GetOptions() override { return &m_options; } - llvm::Optional<std::string> GetRepeatCommand(Args ¤t_command_args, - uint32_t index) override { + std::optional<std::string> GetRepeatCommand(Args ¤t_command_args, + uint32_t index) override { // This is kind of gross, but the command hasn't been parsed yet so we // can't look at the option values for this invocation... I have to scan // the arguments directly. diff --git a/lldb/source/Commands/CommandObjectThread.cpp b/lldb/source/Commands/CommandObjectThread.cpp index 5c4674d68..750bf74 100644 --- a/lldb/source/Commands/CommandObjectThread.cpp +++ b/lldb/source/Commands/CommandObjectThread.cpp @@ -125,8 +125,8 @@ public: Options *GetOptions() override { return &m_options; } - llvm::Optional<std::string> GetRepeatCommand(Args ¤t_args, - uint32_t idx) override { + std::optional<std::string> GetRepeatCommand(Args ¤t_args, + uint32_t idx) override { llvm::StringRef count_opt("--count"); llvm::StringRef start_opt("--start"); @@ -2161,7 +2161,7 @@ public: // Instance variables to hold the values for command options. TraceDumperOptions m_dumper_options; - llvm::Optional<FileSpec> m_output_file; + std::optional<FileSpec> m_output_file; }; CommandObjectTraceDumpFunctionCalls(CommandInterpreter &interpreter) @@ -2198,7 +2198,7 @@ protected: } TraceCursorSP &cursor_sp = *cursor_or_error; - llvm::Optional<StreamFile> out_file; + std::optional<StreamFile> out_file; if (m_options.m_output_file) { out_file.emplace(m_options.m_output_file->GetPath().c_str(), File::eOpenOptionWriteOnly | File::eOpenOptionCanCreate | @@ -2335,7 +2335,7 @@ public: // Instance variables to hold the values for command options. size_t m_count; size_t m_continue; - llvm::Optional<FileSpec> m_output_file; + std::optional<FileSpec> m_output_file; TraceDumperOptions m_dumper_options; }; @@ -2356,8 +2356,8 @@ public: Options *GetOptions() override { return &m_options; } - llvm::Optional<std::string> GetRepeatCommand(Args ¤t_command_args, - uint32_t index) override { + std::optional<std::string> GetRepeatCommand(Args ¤t_command_args, + uint32_t index) override { std::string cmd; current_command_args.GetCommandString(cmd); if (cmd.find(" --continue") == std::string::npos) @@ -2395,7 +2395,7 @@ protected: return false; } - llvm::Optional<StreamFile> out_file; + std::optional<StreamFile> out_file; if (m_options.m_output_file) { out_file.emplace(m_options.m_output_file->GetPath().c_str(), File::eOpenOptionWriteOnly | File::eOpenOptionCanCreate | @@ -2420,7 +2420,7 @@ protected: CommandOptions m_options; // Last traversed id used to continue a repeat command. None means // that all the trace has been consumed. - llvm::Optional<lldb::user_id_t> m_last_id; + std::optional<lldb::user_id_t> m_last_id; }; // CommandObjectTraceDumpInfo |