llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-lldb Author: Kazu Hirata (kazutakahirata) <details> <summary>Changes</summary> Note that StringRef::equals has been deprecated in favor of operator==(StringRef, StringRef). --- Patch is 40.84 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/92476.diff 14 Files Affected: - (modified) lldb/source/Commands/CommandObjectThread.cpp (+2-2) - (modified) lldb/source/Core/FormatEntity.cpp (+6-6) - (modified) lldb/source/Expression/IRExecutionUnit.cpp (+17-17) - (modified) lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp (+4-4) - (modified) lldb/source/Plugins/Language/ObjC/Cocoa.cpp (+1-1) - (modified) lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp (+1-1) - (modified) lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp (+66-67) - (modified) lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerCommon.cpp (+11-11) - (modified) lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp (+2-2) - (modified) lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp (+13-13) - (modified) lldb/source/Plugins/SymbolFile/PDB/PDBASTParser.cpp (+1-1) - (modified) lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp (+2-2) - (modified) lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp (+8-9) - (modified) lldb/source/Target/PathMappingList.cpp (+2-2) ``````````diff diff --git a/lldb/source/Commands/CommandObjectThread.cpp b/lldb/source/Commands/CommandObjectThread.cpp index 3dbbfd4f9d344..4397ee14ea074 100644 --- a/lldb/source/Commands/CommandObjectThread.cpp +++ b/lldb/source/Commands/CommandObjectThread.cpp @@ -151,14 +151,14 @@ class CommandObjectThreadBacktrace : public CommandObjectIterateOverThreads { for (size_t idx = 0; idx < num_entries; idx++) { llvm::StringRef arg_string = copy_args[idx].ref(); - if (arg_string.equals("-c") || count_opt.starts_with(arg_string)) { + if (arg_string == "-c" || count_opt.starts_with(arg_string)) { idx++; if (idx == num_entries) return std::nullopt; count_idx = idx; if (copy_args[idx].ref().getAsInteger(0, count_val)) return std::nullopt; - } else if (arg_string.equals("-s") || start_opt.starts_with(arg_string)) { + } else if (arg_string == "-s" || start_opt.starts_with(arg_string)) { idx++; if (idx == num_entries) return std::nullopt; diff --git a/lldb/source/Core/FormatEntity.cpp b/lldb/source/Core/FormatEntity.cpp index 07978d3882961..1c3a4cb1062fe 100644 --- a/lldb/source/Core/FormatEntity.cpp +++ b/lldb/source/Core/FormatEntity.cpp @@ -1921,7 +1921,7 @@ static Status ParseEntry(const llvm::StringRef &format_str, const size_t n = parent->num_children; for (size_t i = 0; i < n; ++i) { const Definition *entry_def = parent->children + i; - if (key.equals(entry_def->name) || entry_def->name[0] == '*') { + if (key == entry_def->name || entry_def->name[0] == '*') { llvm::StringRef value; if (sep_char) value = @@ -2002,7 +2002,7 @@ static const Definition *FindEntry(const llvm::StringRef &format_str, const size_t n = parent->num_children; for (size_t i = 0; i < n; ++i) { const Definition *entry_def = parent->children + i; - if (p.first.equals(entry_def->name) || entry_def->name[0] == '*') { + if (p.first == entry_def->name || entry_def->name[0] == '*') { if (p.second.empty()) { if (format_str.back() == '.') remainder = format_str.drop_front(format_str.size() - 1); @@ -2351,13 +2351,13 @@ Status FormatEntity::ExtractVariableInfo(llvm::StringRef &format_str, bool FormatEntity::FormatFileSpec(const FileSpec &file_spec, Stream &s, llvm::StringRef variable_name, llvm::StringRef variable_format) { - if (variable_name.empty() || variable_name.equals(".fullpath")) { + if (variable_name.empty() || variable_name == ".fullpath") { file_spec.Dump(s.AsRawOstream()); return true; - } else if (variable_name.equals(".basename")) { + } else if (variable_name == ".basename") { s.PutCString(file_spec.GetFilename().GetStringRef()); return true; - } else if (variable_name.equals(".dirname")) { + } else if (variable_name == ".dirname") { s.PutCString(file_spec.GetFilename().GetStringRef()); return true; } @@ -2440,7 +2440,7 @@ void FormatEntity::AutoComplete(CompletionRequest &request) { // "${thread.id" <TAB> request.AddCompletion(MakeMatch(str, "}")); } - } else if (remainder.equals(".")) { + } else if (remainder == ".") { // "${thread." <TAB> StringList new_matches; AddMatches(entry_def, str, llvm::StringRef(), new_matches); diff --git a/lldb/source/Expression/IRExecutionUnit.cpp b/lldb/source/Expression/IRExecutionUnit.cpp index 07df8c52a2a4f..f220704423627 100644 --- a/lldb/source/Expression/IRExecutionUnit.cpp +++ b/lldb/source/Expression/IRExecutionUnit.cpp @@ -534,63 +534,63 @@ lldb::SectionType IRExecutionUnit::GetSectionTypeFromSectionName( } if (!name.empty()) { - if (name.equals("__text") || name.equals(".text")) + if (name == "__text" || name == ".text") sect_type = lldb::eSectionTypeCode; - else if (name.equals("__data") || name.equals(".data")) + else if (name == "__data" || name == ".data") sect_type = lldb::eSectionTypeCode; else if (name.starts_with("__debug_") || name.starts_with(".debug_")) { const uint32_t name_idx = name[0] == '_' ? 8 : 7; llvm::StringRef dwarf_name(name.substr(name_idx)); switch (dwarf_name[0]) { case 'a': - if (dwarf_name.equals("abbrev")) + if (dwarf_name == "abbrev") sect_type = lldb::eSectionTypeDWARFDebugAbbrev; - else if (dwarf_name.equals("aranges")) + else if (dwarf_name == "aranges") sect_type = lldb::eSectionTypeDWARFDebugAranges; - else if (dwarf_name.equals("addr")) + else if (dwarf_name == "addr") sect_type = lldb::eSectionTypeDWARFDebugAddr; break; case 'f': - if (dwarf_name.equals("frame")) + if (dwarf_name == "frame") sect_type = lldb::eSectionTypeDWARFDebugFrame; break; case 'i': - if (dwarf_name.equals("info")) + if (dwarf_name == "info") sect_type = lldb::eSectionTypeDWARFDebugInfo; break; case 'l': - if (dwarf_name.equals("line")) + if (dwarf_name == "line") sect_type = lldb::eSectionTypeDWARFDebugLine; - else if (dwarf_name.equals("loc")) + else if (dwarf_name == "loc") sect_type = lldb::eSectionTypeDWARFDebugLoc; - else if (dwarf_name.equals("loclists")) + else if (dwarf_name == "loclists") sect_type = lldb::eSectionTypeDWARFDebugLocLists; break; case 'm': - if (dwarf_name.equals("macinfo")) + if (dwarf_name == "macinfo") sect_type = lldb::eSectionTypeDWARFDebugMacInfo; break; case 'p': - if (dwarf_name.equals("pubnames")) + if (dwarf_name == "pubnames") sect_type = lldb::eSectionTypeDWARFDebugPubNames; - else if (dwarf_name.equals("pubtypes")) + else if (dwarf_name == "pubtypes") sect_type = lldb::eSectionTypeDWARFDebugPubTypes; break; case 's': - if (dwarf_name.equals("str")) + if (dwarf_name == "str") sect_type = lldb::eSectionTypeDWARFDebugStr; - else if (dwarf_name.equals("str_offsets")) + else if (dwarf_name == "str_offsets") sect_type = lldb::eSectionTypeDWARFDebugStrOffsets; break; case 'r': - if (dwarf_name.equals("ranges")) + if (dwarf_name == "ranges") sect_type = lldb::eSectionTypeDWARFDebugRanges; break; @@ -599,7 +599,7 @@ lldb::SectionType IRExecutionUnit::GetSectionTypeFromSectionName( } } else if (name.starts_with("__apple_") || name.starts_with(".apple_")) sect_type = lldb::eSectionTypeInvalid; - else if (name.equals("__objc_imageinfo")) + else if (name == "__objc_imageinfo") sect_type = lldb::eSectionTypeOther; } return sect_type; diff --git a/lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp b/lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp index 597873af8b2ae..cc9bd14c6194e 100644 --- a/lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp +++ b/lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp @@ -1449,7 +1449,7 @@ bool IRForTarget::ReplaceVariables(Function &llvm_function) { Argument *argument = &*iter; - if (argument->getName().equals("this")) { + if (argument->getName() == "this") { ++iter; if (iter == llvm_function.arg_end()) { @@ -1461,7 +1461,7 @@ bool IRForTarget::ReplaceVariables(Function &llvm_function) { } argument = &*iter; - } else if (argument->getName().equals("self")) { + } else if (argument->getName() == "self") { ++iter; if (iter == llvm_function.arg_end()) { @@ -1472,7 +1472,7 @@ bool IRForTarget::ReplaceVariables(Function &llvm_function) { return false; } - if (!iter->getName().equals("_cmd")) { + if (iter->getName() != "_cmd") { m_error_stream.Format("Internal error [IRForTarget]: Wrapper takes '{0}' " "after 'self' argument (should take '_cmd')", iter->getName()); @@ -1493,7 +1493,7 @@ bool IRForTarget::ReplaceVariables(Function &llvm_function) { argument = &*iter; } - if (!argument->getName().equals("$__lldb_arg")) { + if (argument->getName() != "$__lldb_arg") { m_error_stream.Format("Internal error [IRForTarget]: Wrapper takes an " "argument named '{0}' instead of the struct pointer", argument->getName()); diff --git a/lldb/source/Plugins/Language/ObjC/Cocoa.cpp b/lldb/source/Plugins/Language/ObjC/Cocoa.cpp index 96166657ceeb6..341923108e321 100644 --- a/lldb/source/Plugins/Language/ObjC/Cocoa.cpp +++ b/lldb/source/Plugins/Language/ObjC/Cocoa.cpp @@ -802,7 +802,7 @@ bool lldb_private::formatters::NSURLSummaryProvider( llvm::StringRef class_name = descriptor->GetClassName().GetStringRef(); - if (!class_name.equals("NSURL")) + if (class_name != "NSURL") return false; uint64_t offset_text = ptr_size + ptr_size + diff --git a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp index d88f2d0830192..5c6b475044be5 100644 --- a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp +++ b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp @@ -3557,7 +3557,7 @@ ObjectFile::Strata ObjectFileELF::CalculateStrata() { // decrease by one llvm::StringRef loader_name(buffer, read_size - 1); llvm::StringRef freebsd_kernel_loader_name("/red/herring"); - if (loader_name.equals(freebsd_kernel_loader_name)) + if (loader_name == freebsd_kernel_loader_name) return eStrataKernel; } } diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp index db9fb37a9a3c3..74e392249a94e 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp @@ -1052,10 +1052,10 @@ bool GDBRemoteCommunicationClient::GetGDBServerVersion() { llvm::StringRef name, value; bool success = false; while (response.GetNameColonValue(name, value)) { - if (name.equals("name")) { + if (name == "name") { success = true; m_gdb_server_name = std::string(value); - } else if (name.equals("version")) { + } else if (name == "version") { llvm::StringRef major, minor; std::tie(major, minor) = value.split('.'); if (!major.getAsInteger(0, m_gdb_server_version)) @@ -1192,12 +1192,12 @@ bool GDBRemoteCommunicationClient::GetDefaultThreadId(lldb::tid_t &tid) { static void ParseOSType(llvm::StringRef value, std::string &os_name, std::string &environment) { - if (value.equals("iossimulator") || value.equals("tvossimulator") || - value.equals("watchossimulator") || value.equals("xrossimulator") || - value.equals("visionossimulator")) { + if (value == "iossimulator" || value == "tvossimulator" || + value == "watchossimulator" || value == "xrossimulator" || + value == "visionossimulator") { environment = "simulator"; os_name = value.drop_back(environment.size()).str(); - } else if (value.equals("maccatalyst")) { + } else if (value == "maccatalyst") { os_name = "ios"; environment = "macabi"; } else { @@ -1230,44 +1230,44 @@ bool GDBRemoteCommunicationClient::GetHostInfo(bool force) { ByteOrder byte_order = eByteOrderInvalid; uint32_t num_keys_decoded = 0; while (response.GetNameColonValue(name, value)) { - if (name.equals("cputype")) { + if (name == "cputype") { // exception type in big endian hex if (!value.getAsInteger(0, cpu)) ++num_keys_decoded; - } else if (name.equals("cpusubtype")) { + } else if (name == "cpusubtype") { // exception count in big endian hex if (!value.getAsInteger(0, sub)) ++num_keys_decoded; - } else if (name.equals("arch")) { + } else if (name == "arch") { arch_name = std::string(value); ++num_keys_decoded; - } else if (name.equals("triple")) { + } else if (name == "triple") { StringExtractor extractor(value); extractor.GetHexByteString(triple); ++num_keys_decoded; - } else if (name.equals("distribution_id")) { + } else if (name == "distribution_id") { StringExtractor extractor(value); extractor.GetHexByteString(m_host_distribution_id); ++num_keys_decoded; - } else if (name.equals("os_build")) { + } else if (name == "os_build") { StringExtractor extractor(value); extractor.GetHexByteString(m_os_build); ++num_keys_decoded; - } else if (name.equals("hostname")) { + } else if (name == "hostname") { StringExtractor extractor(value); extractor.GetHexByteString(m_hostname); ++num_keys_decoded; - } else if (name.equals("os_kernel")) { + } else if (name == "os_kernel") { StringExtractor extractor(value); extractor.GetHexByteString(m_os_kernel); ++num_keys_decoded; - } else if (name.equals("ostype")) { + } else if (name == "ostype") { ParseOSType(value, os_name, environment); ++num_keys_decoded; - } else if (name.equals("vendor")) { + } else if (name == "vendor") { vendor_name = std::string(value); ++num_keys_decoded; - } else if (name.equals("endian")) { + } else if (name == "endian") { byte_order = llvm::StringSwitch<lldb::ByteOrder>(value) .Case("little", eByteOrderLittle) .Case("big", eByteOrderBig) @@ -1275,30 +1275,30 @@ bool GDBRemoteCommunicationClient::GetHostInfo(bool force) { .Default(eByteOrderInvalid); if (byte_order != eByteOrderInvalid) ++num_keys_decoded; - } else if (name.equals("ptrsize")) { + } else if (name == "ptrsize") { if (!value.getAsInteger(0, pointer_byte_size)) ++num_keys_decoded; - } else if (name.equals("addressing_bits")) { + } else if (name == "addressing_bits") { if (!value.getAsInteger(0, m_low_mem_addressing_bits)) { ++num_keys_decoded; } - } else if (name.equals("high_mem_addressing_bits")) { + } else if (name == "high_mem_addressing_bits") { if (!value.getAsInteger(0, m_high_mem_addressing_bits)) ++num_keys_decoded; - } else if (name.equals("low_mem_addressing_bits")) { + } else if (name == "low_mem_addressing_bits") { if (!value.getAsInteger(0, m_low_mem_addressing_bits)) ++num_keys_decoded; - } else if (name.equals("os_version") || - name.equals("version")) // Older debugserver binaries used - // the "version" key instead of - // "os_version"... + } else if (name == "os_version" || + name == "version") // Older debugserver binaries used + // the "version" key instead of + // "os_version"... { if (!m_os_version.tryParse(value)) ++num_keys_decoded; - } else if (name.equals("maccatalyst_version")) { + } else if (name == "maccatalyst_version") { if (!m_maccatalyst_version.tryParse(value)) ++num_keys_decoded; - } else if (name.equals("watchpoint_exceptions_received")) { + } else if (name == "watchpoint_exceptions_received") { m_watchpoints_trigger_after_instruction = llvm::StringSwitch<LazyBool>(value) .Case("before", eLazyBoolNo) @@ -1306,14 +1306,14 @@ bool GDBRemoteCommunicationClient::GetHostInfo(bool force) { .Default(eLazyBoolCalculate); if (m_watchpoints_trigger_after_instruction != eLazyBoolCalculate) ++num_keys_decoded; - } else if (name.equals("default_packet_timeout")) { + } else if (name == "default_packet_timeout") { uint32_t timeout_seconds; if (!value.getAsInteger(0, timeout_seconds)) { m_default_packet_timeout = seconds(timeout_seconds); SetPacketTimeout(m_default_packet_timeout); ++num_keys_decoded; } - } else if (name.equals("vm-page-size")) { + } else if (name == "vm-page-size") { int page_size; if (!value.getAsInteger(0, page_size)) { m_target_vm_page_size = page_size; @@ -1568,10 +1568,10 @@ Status GDBRemoteCommunicationClient::GetMemoryRegionInfo( bool success = true; bool saw_permissions = false; while (success && response.GetNameColonValue(name, value)) { - if (name.equals("start")) { + if (name == "start") { if (!value.getAsInteger(16, addr_value)) region_info.GetRange().SetRangeBase(addr_value); - } else if (name.equals("size")) { + } else if (name == "size") { if (!value.getAsInteger(16, addr_value)) { region_info.GetRange().SetByteSize(addr_value); if (region_info.GetRange().GetRangeEnd() < @@ -1580,8 +1580,7 @@ Status GDBRemoteCommunicationClient::GetMemoryRegionInfo( region_info.GetRange().SetRangeEnd(LLDB_INVALID_ADDRESS); } } - } else if (name.equals("permissions") && - region_info.GetRange().IsValid()) { + } else if (name == "permissions" && region_info.GetRange().IsValid()) { saw_permissions = true; if (region_info.GetRange().Contains(addr)) { if (value.contains('r')) @@ -1608,12 +1607,12 @@ Status GDBRemoteCommunicationClient::GetMemoryRegionInfo( region_info.SetExecutable(MemoryRegionInfo::eNo); region_info.SetMapped(MemoryRegionInfo::eNo); } - } else if (name.equals("name")) { + } else if (name == "name") { StringExtractorGDBRemote name_extractor(value); std::string name; name_extractor.GetHexByteString(name); region_info.SetName(name.c_str()); - } else if (name.equals("flags")) { + } else if (name == "flags") { region_info.SetMemoryTagged(MemoryRegionInfo::eNo); llvm::StringRef flags = value; @@ -1629,7 +1628,7 @@ Status GDBRemoteCommunicationClient::GetMemoryRegionInfo( } } } - } else if (name.equals("type")) { + } else if (name == "type") { std::string comma_sep_str = value.str(); size_t comma_pos; while ((comma_pos = comma_sep_str.find(',')) != std::string::npos) { @@ -1642,13 +1641,13 @@ Status GDBRemoteCommunicationClient::GetMemoryRegionInfo( if (comma_sep_str == "stack") { region_info.SetIsStackMemory(MemoryRegionInfo::eYes); } - } else if (name.equals("error")) { + } else if (name == "error") { StringExtractorGDBRemote error_extractor(value); std::string error_string; // Now convert the HEX bytes into a string value error_extractor.GetHexByteString(error_string); error.SetErrorString(error_string.c_str()); - } else if (name.equals("dirty-pages")) { + } else if (name == "dirty-pages") { std::vector<addr_t> dirty_page_list; for (llvm::StringRef x : llvm::split(value, ',')) { addr_t page; @@ -1825,7 +1824,7 @@ std::optional<uint32_t> GDBRemoteCommunicationClient::GetWatchpointSlotCount() { llvm::StringRef name; llvm::StringRef value; while (re... [truncated] `````````` </details> https://github.com/llvm/llvm-project/pull/92476 _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
