[llvm] 124d9fc - [llvm-readobj] Simplify startswith+drop_front pattern with consume_front. NFC
Fangrui Song via llvm-commits
llvm-commits at lists.llvm.org
Fri Jun 24 00:04:59 PDT 2022
Author: Fangrui Song
Date: 2022-06-24T00:04:55-07:00
New Revision: 124d9fc9585300c0c20388dead9fcaac7043709a
URL: https://github.com/llvm/llvm-project/commit/124d9fc9585300c0c20388dead9fcaac7043709a
DIFF: https://github.com/llvm/llvm-project/commit/124d9fc9585300c0c20388dead9fcaac7043709a.diff
LOG: [llvm-readobj] Simplify startswith+drop_front pattern with consume_front. NFC
Added:
Modified:
llvm/tools/llvm-readobj/ELFDumper.cpp
Removed:
################################################################################
diff --git a/llvm/tools/llvm-readobj/ELFDumper.cpp b/llvm/tools/llvm-readobj/ELFDumper.cpp
index 6b27b11d95db9..faf38bd33e227 100644
--- a/llvm/tools/llvm-readobj/ELFDumper.cpp
+++ b/llvm/tools/llvm-readobj/ELFDumper.cpp
@@ -1423,12 +1423,12 @@ static std::string getGNUPtType(unsigned Arch, unsigned Type) {
return std::string("<unknown>: ") + to_string(format_hex(Type, 1));
// E.g. "PT_ARM_EXIDX" -> "EXIDX".
- if (Seg.startswith("PT_ARM_"))
- return Seg.drop_front(7).str();
+ if (Seg.consume_front("PT_ARM_"))
+ return Seg.str();
// E.g. "PT_MIPS_REGINFO" -> "REGINFO".
- if (Seg.startswith("PT_MIPS_"))
- return Seg.drop_front(8).str();
+ if (Seg.consume_front("PT_MIPS_"))
+ return Seg.str();
// E.g. "PT_LOAD" -> "LOAD".
assert(Seg.startswith("PT_"));
@@ -3641,18 +3641,18 @@ static std::string getSectionTypeString(unsigned Machine, unsigned Type) {
StringRef Name = getELFSectionTypeName(Machine, Type);
// Handle SHT_GNU_* type names.
- if (Name.startswith("SHT_GNU_")) {
- if (Name == "SHT_GNU_HASH")
+ if (Name.consume_front("SHT_GNU_")) {
+ if (Name == "HASH")
return "GNU_HASH";
// E.g. SHT_GNU_verneed -> VERNEED.
- return Name.drop_front(8).upper();
+ return Name.upper();
}
if (Name == "SHT_SYMTAB_SHNDX")
return "SYMTAB SECTION INDICES";
- if (Name.startswith("SHT_"))
- return Name.drop_front(4).str();
+ if (Name.consume_front("SHT_"))
+ return Name.str();
return getSectionTypeOffsetString(Type);
}
More information about the llvm-commits
mailing list