From c712bac78b20f39bb91744e24090c199876f3958 Mon Sep 17 00:00:00 2001 From: Jonas Devlieghere Date: Thu, 28 Mar 2019 18:10:14 +0000 Subject: [PATCH] [NFC] find_first_of/find_last_of -> find/rfind for single char. For a single char argument, find_first_of is equal to find and find_last_of is equal to rfind. While playing around with the plugin stuff this caused an export failure because it always got inlined except once, which resulted in an undefined symbol. llvm-svn: 357198 --- lldb/source/Interpreter/CommandInterpreter.cpp | 2 +- lldb/source/Interpreter/OptionValueProperties.cpp | 3 +-- .../Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp | 4 ++-- lldb/source/Target/CPPLanguageRuntime.cpp | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lldb/source/Interpreter/CommandInterpreter.cpp b/lldb/source/Interpreter/CommandInterpreter.cpp index cccaf3693f38..782412334321 100644 --- a/lldb/source/Interpreter/CommandInterpreter.cpp +++ b/lldb/source/Interpreter/CommandInterpreter.cpp @@ -2589,7 +2589,7 @@ void CommandInterpreter::OutputHelpText(Stream &strm, llvm::StringRef word_text, uint32_t chars_left = max_columns; auto nextWordLength = [](llvm::StringRef S) { - size_t pos = S.find_first_of(' '); + size_t pos = S.find(' '); return pos == llvm::StringRef::npos ? S.size() : pos; }; diff --git a/lldb/source/Interpreter/OptionValueProperties.cpp b/lldb/source/Interpreter/OptionValueProperties.cpp index 6693cc9d4c18..4dae930c3a6f 100644 --- a/lldb/source/Interpreter/OptionValueProperties.cpp +++ b/lldb/source/Interpreter/OptionValueProperties.cpp @@ -159,7 +159,7 @@ OptionValueProperties::GetSubValue(const ExecutionContext *exe_ctx, // args if executable basename is "test" and arch is "x86_64" if (sub_name[1]) { llvm::StringRef predicate_start = sub_name.drop_front(); - size_t pos = predicate_start.find_first_of('}'); + size_t pos = predicate_start.find('}'); if (pos != llvm::StringRef::npos) { auto predicate = predicate_start.take_front(pos); auto rest = predicate_start.drop_front(pos); @@ -204,7 +204,6 @@ Status OptionValueProperties::SetSubValue(const ExecutionContext *exe_ctx, if (Properties::IsSettingExperimental(part)) name_contains_experimental = true; - lldb::OptionValueSP value_sp(GetSubValue(exe_ctx, name, will_modify, error)); if (value_sp) error = value_sp->SetValueFromString(value, op); diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp b/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp index 759fbd01ce12..f11192b7c808 100644 --- a/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp +++ b/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp @@ -109,7 +109,7 @@ PythonString PythonObject::Str() const { PythonObject PythonObject::ResolveNameWithDictionary(llvm::StringRef name, const PythonDictionary &dict) { - size_t dot_pos = name.find_first_of('.'); + size_t dot_pos = name.find('.'); llvm::StringRef piece = name.substr(0, dot_pos); PythonObject result = dict.GetItemForKey(PythonString(piece)); if (dot_pos == llvm::StringRef::npos) { @@ -133,7 +133,7 @@ PythonObject PythonObject::ResolveName(llvm::StringRef name) const { // refers to the `sys` module, and `name` == "path.append", then it will find // the function `sys.path.append`. - size_t dot_pos = name.find_first_of('.'); + size_t dot_pos = name.find('.'); if (dot_pos == llvm::StringRef::npos) { // No dots in the name, we should be able to find the value immediately as // an attribute of `m_py_obj`. diff --git a/lldb/source/Target/CPPLanguageRuntime.cpp b/lldb/source/Target/CPPLanguageRuntime.cpp index ead8d7893249..38d95fa09be2 100644 --- a/lldb/source/Target/CPPLanguageRuntime.cpp +++ b/lldb/source/Target/CPPLanguageRuntime.cpp @@ -170,7 +170,7 @@ CPPLanguageRuntime::FindLibCppStdFunctionCallableInfo( // // This covers the case of the lambda known at compile time. size_t first_open_angle_bracket = vtable_name.find('<') + 1; - size_t first_comma = vtable_name.find_first_of(','); + size_t first_comma = vtable_name.find(','); llvm::StringRef first_template_parameter = vtable_name.slice(first_open_angle_bracket, first_comma);