[Lldb-commits] [lldb] ee667db - [lldb] Use StringRef::{starts, ends}_with (NFC)
Kazu Hirata via lldb-commits
lldb-commits at lists.llvm.org
Sat Dec 16 15:02:24 PST 2023
Author: Kazu Hirata
Date: 2023-12-16T15:02:15-08:00
New Revision: ee667db4b83eb6171bbceca1010cddd0da6f17ca
URL: https://github.com/llvm/llvm-project/commit/ee667db4b83eb6171bbceca1010cddd0da6f17ca
DIFF: https://github.com/llvm/llvm-project/commit/ee667db4b83eb6171bbceca1010cddd0da6f17ca.diff
LOG: [lldb] Use StringRef::{starts,ends}_with (NFC)
This patch replaces uses of StringRef::{starts,ends}with with
StringRef::{starts,ends}_with for consistency with
std::{string,string_view}::{starts,ends}_with in C++20.
I'm planning to deprecate and eventually remove
StringRef::{starts,ends}with.
Added:
Modified:
lldb/source/Host/common/Host.cpp
lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp
lldb/source/Plugins/Process/Windows/Common/DebuggerThread.cpp
lldb/unittests/ScriptInterpreter/Lua/ScriptInterpreterTests.cpp
Removed:
################################################################################
diff --git a/lldb/source/Host/common/Host.cpp b/lldb/source/Host/common/Host.cpp
index 8314d3581f6a47..f4cec97f5af633 100644
--- a/lldb/source/Host/common/Host.cpp
+++ b/lldb/source/Host/common/Host.cpp
@@ -554,7 +554,7 @@ bool Host::IsInteractiveGraphicSession() { return false; }
std::unique_ptr<Connection> Host::CreateDefaultConnection(llvm::StringRef url) {
#if defined(_WIN32)
- if (url.startswith("file://"))
+ if (url.starts_with("file://"))
return std::unique_ptr<Connection>(new ConnectionGenericFile());
#endif
return std::unique_ptr<Connection>(new ConnectionFileDescriptor());
diff --git a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
index 58275c052f74e6..182a9f2afaeb2e 100644
--- a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
+++ b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
@@ -2868,7 +2868,7 @@ void ObjectFileMachO::ParseSymtab(Symtab &symtab) {
if (symbol_name && symbol_name[0] == '_' &&
symbol_name[1] == 'O') {
llvm::StringRef symbol_name_ref(symbol_name);
- if (symbol_name_ref.startswith(
+ if (symbol_name_ref.starts_with(
g_objc_v2_prefix_class)) {
symbol_name_non_abi_mangled = symbol_name + 1;
symbol_name =
@@ -2876,14 +2876,14 @@ void ObjectFileMachO::ParseSymtab(Symtab &symtab) {
type = eSymbolTypeObjCClass;
demangled_is_synthesized = true;
- } else if (symbol_name_ref.startswith(
+ } else if (symbol_name_ref.starts_with(
g_objc_v2_prefix_metaclass)) {
symbol_name_non_abi_mangled = symbol_name + 1;
symbol_name =
symbol_name + g_objc_v2_prefix_metaclass.size();
type = eSymbolTypeObjCMetaClass;
demangled_is_synthesized = true;
- } else if (symbol_name_ref.startswith(
+ } else if (symbol_name_ref.starts_with(
g_objc_v2_prefix_ivar)) {
symbol_name_non_abi_mangled = symbol_name + 1;
symbol_name =
@@ -3382,7 +3382,7 @@ void ObjectFileMachO::ParseSymtab(Symtab &symtab) {
if (symbol_name) {
llvm::StringRef symbol_name_ref(symbol_name);
- if (symbol_name_ref.startswith("_OBJC_")) {
+ if (symbol_name_ref.starts_with("_OBJC_")) {
llvm::StringRef
g_objc_v2_prefix_class(
"_OBJC_CLASS_$_");
@@ -3391,7 +3391,7 @@ void ObjectFileMachO::ParseSymtab(Symtab &symtab) {
"_OBJC_METACLASS_$_");
llvm::StringRef
g_objc_v2_prefix_ivar("_OBJC_IVAR_$_");
- if (symbol_name_ref.startswith(
+ if (symbol_name_ref.starts_with(
g_objc_v2_prefix_class)) {
symbol_name_non_abi_mangled =
symbol_name + 1;
@@ -3401,7 +3401,7 @@ void ObjectFileMachO::ParseSymtab(Symtab &symtab) {
type = eSymbolTypeObjCClass;
demangled_is_synthesized = true;
} else if (
- symbol_name_ref.startswith(
+ symbol_name_ref.starts_with(
g_objc_v2_prefix_metaclass)) {
symbol_name_non_abi_mangled =
symbol_name + 1;
@@ -3410,7 +3410,7 @@ void ObjectFileMachO::ParseSymtab(Symtab &symtab) {
g_objc_v2_prefix_metaclass.size();
type = eSymbolTypeObjCMetaClass;
demangled_is_synthesized = true;
- } else if (symbol_name_ref.startswith(
+ } else if (symbol_name_ref.starts_with(
g_objc_v2_prefix_ivar)) {
symbol_name_non_abi_mangled =
symbol_name + 1;
@@ -3441,7 +3441,7 @@ void ObjectFileMachO::ParseSymtab(Symtab &symtab) {
llvm::StringRef symbol_name_ref(symbol_name);
llvm::StringRef
g_objc_v1_prefix_class(".objc_class_name_");
- if (symbol_name_ref.startswith(
+ if (symbol_name_ref.starts_with(
g_objc_v1_prefix_class)) {
symbol_name_non_abi_mangled = symbol_name;
symbol_name = symbol_name +
diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp
index 4d485e75adcd80..e2839f3285cce4 100644
--- a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp
+++ b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp
@@ -487,8 +487,8 @@ PlatformDarwinKernel::GetKernelsAndKextsInDirectoryHelper(
llvm::StringRef filename = file_spec.GetFilename().GetStringRef();
bool is_kernel_filename =
- filename.startswith("kernel") || filename.startswith("mach");
- bool is_dsym_yaa = filename.endswith(".dSYM.yaa");
+ filename.starts_with("kernel") || filename.starts_with("mach");
+ bool is_dsym_yaa = filename.ends_with(".dSYM.yaa");
if (ft == llvm::sys::fs::file_type::regular_file ||
ft == llvm::sys::fs::file_type::symlink_file) {
diff --git a/lldb/source/Plugins/Process/Windows/Common/DebuggerThread.cpp b/lldb/source/Plugins/Process/Windows/Common/DebuggerThread.cpp
index 93227c55241435..e7fee41239da7c 100644
--- a/lldb/source/Plugins/Process/Windows/Common/DebuggerThread.cpp
+++ b/lldb/source/Plugins/Process/Windows/Common/DebuggerThread.cpp
@@ -501,7 +501,7 @@ DebuggerThread::HandleLoadDllEvent(const LOAD_DLL_DEBUG_INFO &info,
llvm::convertWideToUTF8(buffer.data(), path_str_utf8);
llvm::StringRef path_str = path_str_utf8;
const char *path = path_str.data();
- if (path_str.startswith("\\\\?\\"))
+ if (path_str.starts_with("\\\\?\\"))
path += 4;
on_load_dll(path);
diff --git a/lldb/unittests/ScriptInterpreter/Lua/ScriptInterpreterTests.cpp b/lldb/unittests/ScriptInterpreter/Lua/ScriptInterpreterTests.cpp
index ce6dc586cc4013..2693bef3f5fbd2 100644
--- a/lldb/unittests/ScriptInterpreter/Lua/ScriptInterpreterTests.cpp
+++ b/lldb/unittests/ScriptInterpreter/Lua/ScriptInterpreterTests.cpp
@@ -48,6 +48,6 @@ TEST_F(ScriptInterpreterTest, ExecuteOneLine) {
CommandReturnObject result(/*colors*/ false);
EXPECT_TRUE(script_interpreter.ExecuteOneLine("foo = 1", &result));
EXPECT_FALSE(script_interpreter.ExecuteOneLine("nil = foo", &result));
- EXPECT_TRUE(result.GetErrorData().startswith(
+ EXPECT_TRUE(result.GetErrorData().starts_with(
"error: lua failed attempting to evaluate 'nil = foo'"));
}
More information about the lldb-commits
mailing list