shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[lld] StringRef::{starts,ends}with => {starts,ends}_with. NFC

Browse Source 
The latter form is now preferred to be similar to C++20 starts_with.
This replacement also removes one function call when startswith is not inlined.
This commit is contained in:
Fangrui Song 2023-06-05 14:36:19 -07:00
parent fffa05a2bc
commit 8d85c96e0e
45 changed files with 143 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lld/COFF/Chunks.cpp
View File

@ -703,7 +703,7 @@ ArrayRef<uint8_t> SectionChunk::consumeDebugMagic(ArrayRef<uint8_t> data,
if (data.size() < 4) if (data.size() < 4)
fatal("the section is too short: " + sectionName); fatal("the section is too short: " + sectionName);
if (!sectionName.startswith(".debug$")) if (!sectionName.starts_with(".debug$"))
fatal("invalid section: " + sectionName); fatal("invalid section: " + sectionName);
uint32_t magic = support::endian::read32le(data.data()); uint32_t magic = support::endian::read32le(data.data());

4
lld/COFF/Chunks.h
View File

@ -261,12 +261,12 @@ public:
// True if this is a codeview debug info chunk. These will not be laid out in // True if this is a codeview debug info chunk. These will not be laid out in
// the image. Instead they will end up in the PDB, if one is requested. // the image. Instead they will end up in the PDB, if one is requested.
bool isCodeView() const { bool isCodeView() const {
return getSectionName() == ".debug" || getSectionName().startswith(".debug$"); return getSectionName() == ".debug" || getSectionName().starts_with(".debug$");
} }
// True if this is a DWARF debug info or exception handling chunk. // True if this is a DWARF debug info or exception handling chunk.
bool isDWARF() const { bool isDWARF() const {
return getSectionName().startswith(".debug_") || getSectionName() == ".eh_frame"; return getSectionName().starts_with(".debug_") || getSectionName() == ".eh_frame";
} }
// Allow iteration over the bodies of this chunk's relocated symbols. // Allow iteration over the bodies of this chunk's relocated symbols.

12
lld/COFF/Driver.cpp
View File

@ -113,12 +113,12 @@ static std::string getOutputPath(StringRef path, bool isDll, bool isDriver) {
// Returns true if S matches /crtend.?\.o$/. // Returns true if S matches /crtend.?\.o$/.
static bool isCrtend(StringRef s) { static bool isCrtend(StringRef s) {
if (!s.endswith(".o")) if (!s.ends_with(".o"))
return false; return false;
s = s.drop_back(2); s = s.drop_back(2);
if (s.endswith("crtend")) if (s.ends_with("crtend"))
return true; return true;
return !s.empty() && s.drop_back().endswith("crtend"); return !s.empty() && s.drop_back().ends_with("crtend");
} }
// ErrorOr is not default constructible, so it cannot be used as the type // ErrorOr is not default constructible, so it cannot be used as the type
@ -354,7 +354,7 @@ void LinkerDriver::enqueueArchiveMember(const Archive::Child &c,
} }
bool LinkerDriver::isDecorated(StringRef sym) { bool LinkerDriver::isDecorated(StringRef sym) {
return sym.startswith("@") || sym.contains("@@") || sym.startswith("?") || return sym.starts_with("@") || sym.contains("@@") || sym.starts_with("?") ||
(!ctx.config.mingw && sym.contains('@')); (!ctx.config.mingw && sym.contains('@'));
} }
@ -1085,7 +1085,7 @@ bool LinkerDriver::run() {
void LinkerDriver::parseOrderFile(StringRef arg) { void LinkerDriver::parseOrderFile(StringRef arg) {
// For some reason, the MSVC linker requires a filename to be // For some reason, the MSVC linker requires a filename to be
// preceded by "@". // preceded by "@".
if (!arg.startswith("@")) { if (!arg.starts_with("@")) {
error("malformed /order option: '@' missing"); error("malformed /order option: '@' missing");
return; return;
} }
@ -1778,7 +1778,7 @@ void LinkerDriver::linkerMain(ArrayRef<const char *> argsArr) {
doGC = true; doGC = true;
} else if (s == "noref") { } else if (s == "noref") {
doGC = false; doGC = false;
} else if (s == "icf" || s.startswith("icf=")) { } else if (s == "icf" || s.starts_with("icf=")) {
icfLevel = ICFLevel::All; icfLevel = ICFLevel::All;
} else if (s == "safeicf") { } else if (s == "safeicf") {
icfLevel = ICFLevel::Safe; icfLevel = ICFLevel::Safe;

12
lld/COFF/DriverUtils.cpp
View File

@ -322,7 +322,7 @@ void LinkerDriver::parseSwaprun(StringRef arg) {
else else
error("/swaprun: invalid argument: " + swaprun); error("/swaprun: invalid argument: " + swaprun);
// To catch trailing commas, e.g. `/spawrun:cd,` // To catch trailing commas, e.g. `/spawrun:cd,`
if (newArg.empty() && arg.endswith(",")) if (newArg.empty() && arg.ends_with(","))
error("/swaprun: missing argument"); error("/swaprun: missing argument");
arg = newArg; arg = newArg;
} while (!arg.empty()); } while (!arg.empty());
@ -592,7 +592,7 @@ Export LinkerDriver::parseExport(StringRef arg) {
e.isPrivate = true; e.isPrivate = true;
continue; continue;
} }
if (tok.startswith("@")) { if (tok.starts_with("@")) {
int32_t ord; int32_t ord;
if (tok.substr(1).getAsInteger(0, ord)) if (tok.substr(1).getAsInteger(0, ord))
goto err; goto err;
@ -616,9 +616,9 @@ static StringRef undecorate(COFFLinkerContext &ctx, StringRef sym) {
// as-is with the leading underscore (with type IMPORT_NAME). // as-is with the leading underscore (with type IMPORT_NAME).
// In MinGW mode, a decorated stdcall function gets the underscore // In MinGW mode, a decorated stdcall function gets the underscore
// removed, just like normal cdecl functions. // removed, just like normal cdecl functions.
if (sym.startswith("_") && sym.contains('@') && !ctx.config.mingw) if (sym.starts_with("_") && sym.contains('@') && !ctx.config.mingw)
return sym; return sym;
return sym.startswith("_") ? sym.substr(1) : sym; return sym.starts_with("_") ? sym.substr(1) : sym;
} }
// Convert stdcall/fastcall style symbols into unsuffixed symbols, // Convert stdcall/fastcall style symbols into unsuffixed symbols,
@ -628,8 +628,8 @@ static StringRef killAt(StringRef sym, bool prefix) {
return sym; return sym;
// Strip any trailing stdcall suffix // Strip any trailing stdcall suffix
sym = sym.substr(0, sym.find('@', 1)); sym = sym.substr(0, sym.find('@', 1));
if (!sym.startswith("@")) { if (!sym.starts_with("@")) {
if (prefix && !sym.startswith("_")) if (prefix && !sym.starts_with("_"))
return saver().save("_" + sym); return saver().save("_" + sym);
return sym; return sym;
} }

4
lld/COFF/ICF.cpp
View File

@ -93,7 +93,7 @@ bool ICF::isEligible(SectionChunk *c) {
return true; return true;
// So are vtables. // So are vtables.
if (c->sym && c->sym->getName().startswith("??_7")) if (c->sym && c->sym->getName().starts_with("??_7"))
return true; return true;
// Anything else not in an address-significance table is eligible. // Anything else not in an address-significance table is eligible.
@ -132,7 +132,7 @@ bool ICF::assocEquals(const SectionChunk *a, const SectionChunk *b) {
// debug info and CFGuard metadata. // debug info and CFGuard metadata.
auto considerForICF = [](const SectionChunk &assoc) { auto considerForICF = [](const SectionChunk &assoc) {
StringRef Name = assoc.getSectionName(); StringRef Name = assoc.getSectionName();
return !(Name.startswith(".debug") || Name == ".gfids$y" || return !(Name.starts_with(".debug") || Name == ".gfids$y" ||
Name == ".giats$y" || Name == ".gljmp$y"); Name == ".giats$y" || Name == ".gljmp$y");
}; };
auto ra = make_filter_range(a->children(), considerForICF); auto ra = make_filter_range(a->children(), considerForICF);

8
lld/COFF/InputFiles.cpp
View File

@ -237,7 +237,7 @@ SectionChunk *ObjFile::readSection(uint32_t sectionNumber,
// and then write it to a separate .pdb file. // and then write it to a separate .pdb file.
// Ignore DWARF debug info unless /debug is given. // Ignore DWARF debug info unless /debug is given.
if (!ctx.config.debug && name.startswith(".debug_")) if (!ctx.config.debug && name.starts_with(".debug_"))
return nullptr; return nullptr;
if (sec->Characteristics & llvm::COFF::IMAGE_SCN_LNK_REMOVE) if (sec->Characteristics & llvm::COFF::IMAGE_SCN_LNK_REMOVE)
@ -261,12 +261,12 @@ SectionChunk *ObjFile::readSection(uint32_t sectionNumber,
else if (name == ".sxdata") else if (name == ".sxdata")
sxDataChunks.push_back(c); sxDataChunks.push_back(c);
else if (ctx.config.tailMerge && sec->NumberOfRelocations == 0 && else if (ctx.config.tailMerge && sec->NumberOfRelocations == 0 &&
name == ".rdata" && leaderName.startswith("??_C@")) name == ".rdata" && leaderName.starts_with("??_C@"))
// COFF sections that look like string literal sections (i.e. no // COFF sections that look like string literal sections (i.e. no
// relocations, in .rdata, leader symbol name matches the MSVC name mangling // relocations, in .rdata, leader symbol name matches the MSVC name mangling
// for string literals) are subject to string tail merging. // for string literals) are subject to string tail merging.
MergeChunk::addSection(ctx, c); MergeChunk::addSection(ctx, c);
else if (name == ".rsrc" || name.startswith(".rsrc$")) else if (name == ".rsrc" || name.starts_with(".rsrc$"))
resourceChunks.push_back(c); resourceChunks.push_back(c);
else else
chunks.push_back(c); chunks.push_back(c);
@ -366,7 +366,7 @@ Symbol *ObjFile::createRegular(COFFSymbolRef sym) {
// everything should be fine. If something actually refers to the symbol // everything should be fine. If something actually refers to the symbol
// (e.g. the undefined weak alias), linking will fail due to undefined // (e.g. the undefined weak alias), linking will fail due to undefined
// references at the end. // references at the end.
if (ctx.config.mingw && name.startswith(".weak.")) if (ctx.config.mingw && name.starts_with(".weak."))
return nullptr; return nullptr;
return ctx.symtab.addUndefined(name, this, false); return ctx.symtab.addUndefined(name, this, false);
} }

4
lld/COFF/MinGW.cpp
View File

@ -144,10 +144,10 @@ bool AutoExporter::shouldExport(Defined *sym) const {
return false; return false;
for (StringRef prefix : excludeSymbolPrefixes.keys()) for (StringRef prefix : excludeSymbolPrefixes.keys())
if (sym->getName().startswith(prefix)) if (sym->getName().starts_with(prefix))
return false; return false;
for (StringRef suffix : excludeSymbolSuffixes.keys()) for (StringRef suffix : excludeSymbolSuffixes.keys())
if (sym->getName().endswith(suffix)) if (sym->getName().ends_with(suffix))
return false; return false;
// If a corresponding __imp_ symbol exists and is defined, don't export it. // If a corresponding __imp_ symbol exists and is defined, don't export it.

6
lld/COFF/PDB.cpp
View File

@ -1213,8 +1213,8 @@ void PDBLinker::addPublicsToPDB() {
// Drop the '_' prefix for x86. // Drop the '_' prefix for x86.
if (ctx.config.machine == I386) if (ctx.config.machine == I386)
name = name.drop_front(1); name = name.drop_front(1);
if (name.startswith("__profd_") || name.startswith("__profc_") || if (name.starts_with("__profd_") || name.starts_with("__profc_") ||
name.startswith("__covrec_")) { name.starts_with("__covrec_")) {
return; return;
} }
} }
@ -1469,7 +1469,7 @@ static void addLinkerModuleCoffGroup(PartialSection *sec,
// Somehow .idata sections & sections groups in the debug symbol stream have // Somehow .idata sections & sections groups in the debug symbol stream have
// the "write" flag set. However the section header for the corresponding // the "write" flag set. However the section header for the corresponding
// .idata section doesn't have it. // .idata section doesn't have it.
if (cgs.Name.startswith(".idata")) if (cgs.Name.starts_with(".idata"))
cgs.Characteristics |= llvm::COFF::IMAGE_SCN_MEM_WRITE; cgs.Characteristics |= llvm::COFF::IMAGE_SCN_MEM_WRITE;
mod.addSymbol(codeview::SymbolSerializer::writeOneSymbol( mod.addSymbol(codeview::SymbolSerializer::writeOneSymbol(

18
lld/COFF/SymbolTable.cpp
View File

@ -317,7 +317,7 @@ void SymbolTable::loadMinGWSymbols() {
} }
if (ctx.config.autoImport) { if (ctx.config.autoImport) {
if (name.startswith("__imp_")) if (name.starts_with("__imp_"))
continue; continue;
// If we have an undefined symbol, but we have a lazy symbol we could // If we have an undefined symbol, but we have a lazy symbol we could
// load, load it. // load, load it.
@ -333,7 +333,7 @@ void SymbolTable::loadMinGWSymbols() {
} }
Defined *SymbolTable::impSymbol(StringRef name) { Defined *SymbolTable::impSymbol(StringRef name) {
if (name.startswith("__imp_")) if (name.starts_with("__imp_"))
return nullptr; return nullptr;
return dyn_cast_or_null<Defined>(find(("__imp_" + name).str())); return dyn_cast_or_null<Defined>(find(("__imp_" + name).str()));
} }
@ -456,7 +456,7 @@ void SymbolTable::reportUnresolvable() {
if (undef->getWeakAlias()) if (undef->getWeakAlias())
continue; continue;
StringRef name = undef->getName(); StringRef name = undef->getName();
if (name.startswith("__imp_")) { if (name.starts_with("__imp_")) {
Symbol *imp = find(name.substr(strlen("__imp_"))); Symbol *imp = find(name.substr(strlen("__imp_")));
if (imp && isa<Defined>(imp)) if (imp && isa<Defined>(imp))
continue; continue;
@ -504,7 +504,7 @@ void SymbolTable::resolveRemainingUndefines() {
// If we can resolve a symbol by removing __imp_ prefix, do that. // If we can resolve a symbol by removing __imp_ prefix, do that.
// This odd rule is for compatibility with MSVC linker. // This odd rule is for compatibility with MSVC linker.
if (name.startswith("__imp_")) { if (name.starts_with("__imp_")) {
Symbol *imp = find(name.substr(strlen("__imp_"))); Symbol *imp = find(name.substr(strlen("__imp_")));
if (imp && isa<Defined>(imp)) { if (imp && isa<Defined>(imp)) {
auto *d = cast<Defined>(imp); auto *d = cast<Defined>(imp);
@ -816,9 +816,9 @@ std::vector<Symbol *> SymbolTable::getSymsWithPrefix(StringRef prefix) {
std::vector<Symbol *> syms; std::vector<Symbol *> syms;
for (auto pair : symMap) { for (auto pair : symMap) {
StringRef name = pair.first.val(); StringRef name = pair.first.val();
if (name.startswith(prefix) || name.startswith(prefix.drop_front()) || if (name.starts_with(prefix) || name.starts_with(prefix.drop_front()) ||
name.drop_front().startswith(prefix) || name.drop_front().starts_with(prefix) ||
name.drop_front().startswith(prefix.drop_front())) { name.drop_front().starts_with(prefix.drop_front())) {
syms.push_back(pair.second); syms.push_back(pair.second);
} }
} }
@ -846,7 +846,7 @@ Symbol *SymbolTable::findMangle(StringRef name) {
auto findByPrefix = [&syms](const Twine &t) -> Symbol * { auto findByPrefix = [&syms](const Twine &t) -> Symbol * {
std::string prefix = t.str(); std::string prefix = t.str();
for (auto *s : syms) for (auto *s : syms)
if (s->getName().startswith(prefix)) if (s->getName().starts_with(prefix))
return s; return s;
return nullptr; return nullptr;
}; };
@ -855,7 +855,7 @@ Symbol *SymbolTable::findMangle(StringRef name) {
if (ctx.config.machine != I386) if (ctx.config.machine != I386)
return findByPrefix("?" + name + "@@Y"); return findByPrefix("?" + name + "@@Y");
if (!name.startswith("_")) if (!name.starts_with("_"))
return nullptr; return nullptr;
// Search for x86 stdcall function. // Search for x86 stdcall function.
if (Symbol *s = findByPrefix(name + "@")) if (Symbol *s = findByPrefix(name + "@"))

16
lld/COFF/Writer.cpp
View File

@ -736,7 +736,7 @@ void Writer::fixPartialSectionChars(StringRef name, uint32_t chars) {
PartialSection *pSec = it.second; PartialSection *pSec = it.second;
StringRef curName = pSec->name; StringRef curName = pSec->name;
if (!curName.consume_front(name) || if (!curName.consume_front(name) ||
(!curName.empty() && !curName.startswith("$"))) (!curName.empty() && !curName.starts_with("$")))
continue; continue;
if (pSec->characteristics == chars) if (pSec->characteristics == chars)
continue; continue;
@ -769,7 +769,7 @@ bool Writer::fixGnuImportChunks() {
// with alphabetical ordering of the object files within a library. // with alphabetical ordering of the object files within a library.
for (auto it : partialSections) { for (auto it : partialSections) {
PartialSection *pSec = it.second; PartialSection *pSec = it.second;
if (!pSec->name.startswith(".idata")) if (!pSec->name.starts_with(".idata"))
continue; continue;
if (!pSec->chunks.empty()) if (!pSec->chunks.empty())
@ -857,9 +857,9 @@ static bool shouldStripSectionSuffix(SectionChunk *sc, StringRef name,
return false; return false;
if (!sc || !sc->isCOMDAT()) if (!sc || !sc->isCOMDAT())
return false; return false;
return name.startswith(".text$") || name.startswith(".data$") || return name.starts_with(".text$") || name.starts_with(".data$") ||
name.startswith(".rdata$") || name.startswith(".pdata$") || name.starts_with(".rdata$") || name.starts_with(".pdata$") ||
name.startswith(".xdata$") || name.startswith(".eh_frame$"); name.starts_with(".xdata$") || name.starts_with(".eh_frame$");
} }
void Writer::sortSections() { void Writer::sortSections() {
@ -924,7 +924,7 @@ void Writer::createSections() {
if (shouldStripSectionSuffix(sc, name, ctx.config.mingw)) if (shouldStripSectionSuffix(sc, name, ctx.config.mingw))
name = name.split('$').first; name = name.split('$').first;
if (name.startswith(".tls")) if (name.starts_with(".tls"))
tlsAlignment = std::max(tlsAlignment, c->getAlignment()); tlsAlignment = std::max(tlsAlignment, c->getAlignment());
PartialSection *pSec = createPartialSection(name, PartialSection *pSec = createPartialSection(name,
@ -985,7 +985,7 @@ void Writer::createSections() {
// Move discardable sections named .debug_ to the end, after other // Move discardable sections named .debug_ to the end, after other
// discardable sections. Stripping only removes the sections named // discardable sections. Stripping only removes the sections named
// .debug_* - thus try to avoid leaving holes after stripping. // .debug_* - thus try to avoid leaving holes after stripping.
if (s->name.startswith(".debug_")) if (s->name.starts_with(".debug_"))
return 3; return 3;
return 2; return 2;
} }
@ -1143,7 +1143,7 @@ void Writer::createExportTable() {
} }
// Warn on exported deleting destructor. // Warn on exported deleting destructor.
for (auto e : ctx.config.exports) for (auto e : ctx.config.exports)
if (e.sym && e.sym->getName().startswith("??_G")) if (e.sym && e.sym->getName().starts_with("??_G"))
warn("export of deleting dtor: " + toString(ctx, *e.sym)); warn("export of deleting dtor: " + toString(ctx, *e.sym));
} }

2
lld/Common/Args.cpp
View File

@ -31,7 +31,7 @@ static int64_t getInteger(opt::InputArgList &args, unsigned key,
int64_t v; int64_t v;
StringRef s = a->getValue(); StringRef s = a->getValue();
if (base == 16 && (s.startswith("0x") || s.startswith("0X"))) if (base == 16 && (s.starts_with("0x") || s.starts_with("0X")))
s = s.drop_front(2); s = s.drop_front(2);
if (to_integer(s, v, base)) if (to_integer(s, v, base))
return v; return v;

4
lld/Common/Reproduce.cpp
View File

@ -32,9 +32,9 @@ std::string lld::relativeToRoot(StringRef path) {
// of the result. // of the result.
SmallString<128> res; SmallString<128> res;
StringRef root = path::root_name(abs); StringRef root = path::root_name(abs);
if (root.endswith(":")) if (root.ends_with(":"))
res = root.drop_back(); res = root.drop_back();
else if (root.startswith("//")) else if (root.starts_with("//"))
res = root.substr(2); res = root.substr(2);
path::append(res, path::relative_path(abs)); path::append(res, path::relative_path(abs));

4
lld/Common/Strings.cpp
View File

@ -19,8 +19,8 @@ using namespace llvm;
using namespace lld; using namespace lld;
SingleStringMatcher::SingleStringMatcher(StringRef Pattern) { SingleStringMatcher::SingleStringMatcher(StringRef Pattern) {
if (Pattern.size() > 2 && Pattern.startswith("\"") && if (Pattern.size() > 2 && Pattern.starts_with("\"") &&
Pattern.endswith("\"")) { Pattern.ends_with("\"")) {
ExactMatch = true; ExactMatch = true;
ExactPattern = Pattern.substr(1, Pattern.size() - 2); ExactPattern = Pattern.substr(1, Pattern.size() - 2);
} else { } else {

4
lld/ELF/AArch64ErrataFix.cpp
View File

@ -432,10 +432,10 @@ void AArch64Err843419Patcher::init() {
// [Symbol Value, End of section). The type, code or data, is determined by // [Symbol Value, End of section). The type, code or data, is determined by
// the mapping symbol name, $x for code, $d for data. // the mapping symbol name, $x for code, $d for data.
auto isCodeMapSymbol = [](const Symbol *b) { auto isCodeMapSymbol = [](const Symbol *b) {
return b->getName() == "$x" || b->getName().startswith("$x."); return b->getName() == "$x" || b->getName().starts_with("$x.");
}; };
auto isDataMapSymbol = [](const Symbol *b) { auto isDataMapSymbol = [](const Symbol *b) {
return b->getName() == "$d" || b->getName().startswith("$d."); return b->getName() == "$d" || b->getName().starts_with("$d.");
}; };
// Collect mapping symbols for every executable InputSection. // Collect mapping symbols for every executable InputSection.

6
lld/ELF/ARMErrataFix.cpp
View File

@ -317,13 +317,13 @@ void ARMErr657417Patcher::init() {
// [Symbol Value, End of section). The type, code or data, is determined by // [Symbol Value, End of section). The type, code or data, is determined by
// the mapping symbol name, $a for Arm code, $t for Thumb code, $d for data. // the mapping symbol name, $a for Arm code, $t for Thumb code, $d for data.
auto isArmMapSymbol = [](const Symbol *s) { auto isArmMapSymbol = [](const Symbol *s) {
return s->getName() == "$a" || s->getName().startswith("$a."); return s->getName() == "$a" || s->getName().starts_with("$a.");
}; };
auto isThumbMapSymbol = [](const Symbol *s) { auto isThumbMapSymbol = [](const Symbol *s) {
return s->getName() == "$t" || s->getName().startswith("$t."); return s->getName() == "$t" || s->getName().starts_with("$t.");
}; };
auto isDataMapSymbol = [](const Symbol *s) { auto isDataMapSymbol = [](const Symbol *s) {
return s->getName() == "$d" || s->getName().startswith("$d."); return s->getName() == "$d" || s->getName().starts_with("$d.");
}; };
// Collect mapping symbols for every executable InputSection. // Collect mapping symbols for every executable InputSection.

22
lld/ELF/Driver.cpp
View File

@ -152,7 +152,7 @@ bool elf::link(ArrayRef<const char *> args, llvm::raw_ostream &stdoutOS,
static std::tuple<ELFKind, uint16_t, uint8_t> parseEmulation(StringRef emul) { static std::tuple<ELFKind, uint16_t, uint8_t> parseEmulation(StringRef emul) {
uint8_t osabi = 0; uint8_t osabi = 0;
StringRef s = emul; StringRef s = emul;
if (s.endswith("_fbsd")) { if (s.ends_with("_fbsd")) {
s = s.drop_back(5); s = s.drop_back(5);
osabi = ELFOSABI_FREEBSD; osabi = ELFOSABI_FREEBSD;
} }
@ -529,11 +529,11 @@ constexpr const char *knownZFlags[] = {
static bool isKnownZFlag(StringRef s) { static bool isKnownZFlag(StringRef s) {
return llvm::is_contained(knownZFlags, s) || return llvm::is_contained(knownZFlags, s) ||
s.startswith("common-page-size=") || s.startswith("bti-report=") || s.starts_with("common-page-size=") || s.starts_with("bti-report=") ||
s.startswith("cet-report=") || s.starts_with("cet-report=") ||
s.startswith("dead-reloc-in-nonalloc=") || s.starts_with("dead-reloc-in-nonalloc=") ||
s.startswith("max-page-size=") || s.startswith("stack-size=") || s.starts_with("max-page-size=") || s.starts_with("stack-size=") ||
s.startswith("start-stop-visibility="); s.starts_with("start-stop-visibility=");
} }
// Report a warning for an unknown -z option. // Report a warning for an unknown -z option.
@ -713,7 +713,7 @@ static bool isOutputFormatBinary(opt::InputArgList &args) {
StringRef s = args.getLastArgValue(OPT_oformat, "elf"); StringRef s = args.getLastArgValue(OPT_oformat, "elf");
if (s == "binary") if (s == "binary")
return true; return true;
if (!s.startswith("elf")) if (!s.starts_with("elf"))
error("unknown --oformat value: " + s); error("unknown --oformat value: " + s);
return false; return false;
} }
@ -797,7 +797,7 @@ static StripPolicy getStrip(opt::InputArgList &args) {
static uint64_t parseSectionAddress(StringRef s, opt::InputArgList &args, static uint64_t parseSectionAddress(StringRef s, opt::InputArgList &args,
const opt::Arg &arg) { const opt::Arg &arg) {
uint64_t va = 0; uint64_t va = 0;
if (s.startswith("0x")) if (s.starts_with("0x"))
s = s.drop_front(2); s = s.drop_front(2);
if (!to_integer(s, va, 16)) if (!to_integer(s, va, 16))
error("invalid argument: " + arg.getAsString(args)); error("invalid argument: " + arg.getAsString(args));
@ -862,7 +862,7 @@ getBuildId(opt::InputArgList &args) {
return {BuildIdKind::Sha1, {}}; return {BuildIdKind::Sha1, {}};
if (s == "uuid") if (s == "uuid")
return {BuildIdKind::Uuid, {}}; return {BuildIdKind::Uuid, {}};
if (s.startswith("0x")) if (s.starts_with("0x"))
return {BuildIdKind::Hexstring, parseHex(s.substr(2))}; return {BuildIdKind::Hexstring, parseHex(s.substr(2))};
if (s != "none") if (s != "none")
@ -1442,7 +1442,7 @@ static void readConfigs(opt::InputArgList &args) {
// unsupported LLVMgold.so option and error. // unsupported LLVMgold.so option and error.
for (opt::Arg *arg : args.filtered(OPT_plugin_opt_eq)) { for (opt::Arg *arg : args.filtered(OPT_plugin_opt_eq)) {
StringRef v(arg->getValue()); StringRef v(arg->getValue());
if (!v.endswith("lto-wrapper") && !v.endswith("lto-wrapper.exe")) if (!v.ends_with("lto-wrapper") && !v.ends_with("lto-wrapper.exe"))
error(arg->getSpelling() + ": unknown plugin option '" + arg->getValue() + error(arg->getSpelling() + ": unknown plugin option '" + arg->getValue() +
"'"); "'");
} }
@ -1497,7 +1497,7 @@ static void readConfigs(opt::InputArgList &args) {
std::tie(config->ekind, config->emachine, config->osabi) = std::tie(config->ekind, config->emachine, config->osabi) =
parseEmulation(s); parseEmulation(s);
config->mipsN32Abi = config->mipsN32Abi =
(s.startswith("elf32btsmipn32") || s.startswith("elf32ltsmipn32")); (s.starts_with("elf32btsmipn32") || s.starts_with("elf32ltsmipn32"));
config->emulation = s; config->emulation = s;
} }

4
lld/ELF/DriverUtils.cpp
View File

@ -214,7 +214,7 @@ std::string elf::createResponseFile(const opt::InputArgList &args) {
static std::optional<std::string> findFile(StringRef path1, static std::optional<std::string> findFile(StringRef path1,
const Twine &path2) { const Twine &path2) {
SmallString<128> s; SmallString<128> s;
if (path1.startswith("=")) if (path1.starts_with("="))
path::append(s, config->sysroot, path1.substr(1), path2); path::append(s, config->sysroot, path1.substr(1), path2);
else else
path::append(s, path1, path2); path::append(s, path1, path2);
@ -247,7 +247,7 @@ std::optional<std::string> elf::searchLibraryBaseName(StringRef name) {
// This is for -l<namespec>. // This is for -l<namespec>.
std::optional<std::string> elf::searchLibrary(StringRef name) { std::optional<std::string> elf::searchLibrary(StringRef name) {
llvm::TimeTraceScope timeScope("Locate library", name); llvm::TimeTraceScope timeScope("Locate library", name);
if (name.startswith(":")) if (name.starts_with(":"))
return findFromSearchPaths(name.substr(1)); return findFromSearchPaths(name.substr(1));
return searchLibraryBaseName(name); return searchLibraryBaseName(name);
} }

2
lld/ELF/ICF.cpp
View File

@ -165,7 +165,7 @@ static bool isEligible(InputSection *s) {
// Don't merge writable sections. .data.rel.ro sections are marked as writable // Don't merge writable sections. .data.rel.ro sections are marked as writable
// but are semantically read-only. // but are semantically read-only.
if ((s->flags & SHF_WRITE) && s->name != ".data.rel.ro" && if ((s->flags & SHF_WRITE) && s->name != ".data.rel.ro" &&
!s->name.startswith(".data.rel.ro.")) !s->name.starts_with(".data.rel.ro."))
return false; return false;
// SHF_LINK_ORDER sections are ICF'd as a unit with their dependent sections, // SHF_LINK_ORDER sections are ICF'd as a unit with their dependent sections,

6
lld/ELF/InputFiles.cpp
View File

@ -76,7 +76,7 @@ static ELFKind getELFKind(MemoryBufferRef mb, StringRef archiveName) {
fatal(archiveName + "(" + filename + "): " + msg); fatal(archiveName + "(" + filename + "): " + msg);
}; };
if (!mb.getBuffer().startswith(ElfMagic)) if (!mb.getBuffer().starts_with(ElfMagic))
report("not an ELF file"); report("not an ELF file");
if (endian != ELFDATA2LSB && endian != ELFDATA2MSB) if (endian != ELFDATA2LSB && endian != ELFDATA2MSB)
report("corrupted ELF file: invalid data encoding"); report("corrupted ELF file: invalid data encoding");
@ -192,7 +192,7 @@ std::optional<MemoryBufferRef> elf::readFile(StringRef path) {
// The --chroot option changes our virtual root directory. // The --chroot option changes our virtual root directory.
// This is useful when you are dealing with files created by --reproduce. // This is useful when you are dealing with files created by --reproduce.
if (!config->chroot.empty() && path.startswith("/")) if (!config->chroot.empty() && path.starts_with("/"))
path = saver().save(config->chroot + path); path = saver().save(config->chroot + path);
bool remapped = false; bool remapped = false;
@ -959,7 +959,7 @@ template <class ELFT>
InputSectionBase *ObjFile<ELFT>::createInputSection(uint32_t idx, InputSectionBase *ObjFile<ELFT>::createInputSection(uint32_t idx,
const Elf_Shdr &sec, const Elf_Shdr &sec,
StringRef name) { StringRef name) {
if (name.startswith(".n")) { if (name.starts_with(".n")) {
// The GNU linker uses .note.GNU-stack section as a marker indicating // The GNU linker uses .note.GNU-stack section as a marker indicating
// that the code in the object file does not expect that the stack is // that the code in the object file does not expect that the stack is
// executable (in terms of NX bit). If all input files have the marker, // executable (in terms of NX bit). If all input files have the marker,

2
lld/ELF/InputSection.cpp
View File

@ -1040,7 +1040,7 @@ void InputSectionBase::adjustSplitStackFunctionPrologues(uint8_t *buf,
for (Relocation &rel : relocs()) { for (Relocation &rel : relocs()) {
// Ignore calls into the split-stack api. // Ignore calls into the split-stack api.
if (rel.sym->getName().startswith("__morestack")) { if (rel.sym->getName().starts_with("__morestack")) {
if (rel.sym->getName().equals("__morestack")) if (rel.sym->getName().equals("__morestack"))
morestackCalls.push_back(&rel); morestackCalls.push_back(&rel);
continue; continue;

2
lld/ELF/InputSection.h
View File

@ -426,7 +426,7 @@ public:
inline bool isDebugSection(const InputSectionBase &sec) { inline bool isDebugSection(const InputSectionBase &sec) {
return (sec.flags & llvm::ELF::SHF_ALLOC) == 0 && return (sec.flags & llvm::ELF::SHF_ALLOC) == 0 &&
sec.name.startswith(".debug"); sec.name.starts_with(".debug");
} }
// The set of TOC entries (.toc + addend) for which we should not apply // The set of TOC entries (.toc + addend) for which we should not apply

2
lld/ELF/LTO.cpp
View File

@ -217,7 +217,7 @@ BitcodeCompiler::BitcodeCompiler() {
continue; continue;
StringRef s = sym->getName(); StringRef s = sym->getName();
for (StringRef prefix : {"__start_", "__stop_"}) for (StringRef prefix : {"__start_", "__stop_"})
if (s.startswith(prefix)) if (s.starts_with(prefix))
usedStartStop.insert(s.substr(prefix.size())); usedStartStop.insert(s.substr(prefix.size()));
} }
} }

6
lld/ELF/MarkLive.cpp
View File

@ -174,8 +174,8 @@ static bool isReserved(InputSectionBase *sec) {
// .init_array.N (https://github.com/rust-lang/rust/issues/92181) for a // .init_array.N (https://github.com/rust-lang/rust/issues/92181) for a
// while. // while.
StringRef s = sec->name; StringRef s = sec->name;
return s == ".init" || s == ".fini" || s.startswith(".init_array") || return s == ".init" || s == ".fini" || s.starts_with(".init_array") ||
s == ".jcr" || s.startswith(".ctors") || s.startswith(".dtors"); s == ".jcr" || s.starts_with(".ctors") || s.starts_with(".dtors");
} }
} }
@ -285,7 +285,7 @@ template <class ELFT> void MarkLive<ELFT>::run() {
// script KEEP command. // script KEEP command.
if (isReserved(sec) || script->shouldKeep(sec)) { if (isReserved(sec) || script->shouldKeep(sec)) {
enqueue(sec, 0); enqueue(sec, 0);
} else if ((!config->zStartStopGC || sec->name.startswith("__libc_")) && } else if ((!config->zStartStopGC || sec->name.starts_with("__libc_")) &&
isValidCIdentifier(sec->name)) { isValidCIdentifier(sec->name)) {
// As a workaround for glibc libc.a before 2.34 // As a workaround for glibc libc.a before 2.34
// (https://sourceware.org/PR27492), retain __libc_atexit and similar // (https://sourceware.org/PR27492), retain __libc_atexit and similar

4
lld/ELF/OutputSections.cpp
View File

@ -331,7 +331,7 @@ template <class ELFT> void OutputSection::maybeCompress() {
// Compress only DWARF debug sections. // Compress only DWARF debug sections.
if (config->compressDebugSections == DebugCompressionType::None || if (config->compressDebugSections == DebugCompressionType::None ||
(flags & SHF_ALLOC) || !name.startswith(".debug_") || size == 0) (flags & SHF_ALLOC) || !name.starts_with(".debug_") || size == 0)
return; return;
llvm::TimeTraceScope timeScope("Compress debug sections"); llvm::TimeTraceScope timeScope("Compress debug sections");
@ -669,7 +669,7 @@ int elf::getPriority(StringRef s) {
return 65536; return 65536;
int v = 65536; int v = 65536;
if (to_integer(s.substr(pos + 1), v, 10) && if (to_integer(s.substr(pos + 1), v, 10) &&
(pos == 6 && (s.startswith(".ctors") || s.startswith(".dtors")))) (pos == 6 && (s.starts_with(".ctors") || s.starts_with(".dtors"))))
v = 65535 - v; v = 65535 - v;
return v; return v;
} }

8
lld/ELF/Relocations.cpp
View File

@ -110,7 +110,7 @@ void elf::reportRangeError(uint8_t *loc, const Relocation &rel, const Twine &v,
if (rel.sym && !rel.sym->isSection()) if (rel.sym && !rel.sym->isSection())
hint += getDefinedLocation(*rel.sym); hint += getDefinedLocation(*rel.sym);
if (errPlace.isec && errPlace.isec->name.startswith(".debug")) if (errPlace.isec && errPlace.isec->name.starts_with(".debug"))
hint += "; consider recompiling with -fdebug-types-section to reduce size " hint += "; consider recompiling with -fdebug-types-section to reduce size "
"of debug sections"; "of debug sections";
@ -656,7 +656,7 @@ static const Symbol *getAlternativeSpelling(const Undefined &sym,
// The reference may be a mangled name while the definition is not. Suggest a // The reference may be a mangled name while the definition is not. Suggest a
// missing extern "C". // missing extern "C".
if (name.startswith("_Z")) { if (name.starts_with("_Z")) {
std::string buf = name.str(); std::string buf = name.str();
llvm::ItaniumPartialDemangler d; llvm::ItaniumPartialDemangler d;
if (!d.partialDemangle(buf.c_str())) if (!d.partialDemangle(buf.c_str()))
@ -758,12 +758,12 @@ static void reportUndefinedSymbol(const UndefinedDiag &undef,
} }
} }
if (sym.getName().startswith("_ZTV")) if (sym.getName().starts_with("_ZTV"))
msg += msg +=
"\n>>> the vtable symbol may be undefined because the class is missing " "\n>>> the vtable symbol may be undefined because the class is missing "
"its key function (see https://lld.llvm.org/missingkeyfunction)"; "its key function (see https://lld.llvm.org/missingkeyfunction)";
if (config->gcSections && config->zStartStopGC && if (config->gcSections && config->zStartStopGC &&
sym.getName().startswith("__start_")) { sym.getName().starts_with("__start_")) {
msg += "\n>>> the encapsulation symbol needs to be retained under " msg += "\n>>> the encapsulation symbol needs to be retained under "
"--gc-sections properly; consider -z nostart-stop-gc " "--gc-sections properly; consider -z nostart-stop-gc "
"(see https://lld.llvm.org/ELF/start-stop-gc)"; "(see https://lld.llvm.org/ELF/start-stop-gc)";

16
lld/ELF/ScriptLexer.cpp
View File

@ -120,7 +120,7 @@ void ScriptLexer::tokenize(MemoryBufferRef mb) {
// because, in a glob match context, only unquoted tokens are interpreted // because, in a glob match context, only unquoted tokens are interpreted
// as glob patterns. Double-quoted tokens are literal patterns in that // as glob patterns. Double-quoted tokens are literal patterns in that
// context. // context.
if (s.startswith("\"")) { if (s.starts_with("\"")) {
size_t e = s.find("\"", 1); size_t e = s.find("\"", 1);
if (e == StringRef::npos) { if (e == StringRef::npos) {
StringRef filename = mb.getBufferIdentifier(); StringRef filename = mb.getBufferIdentifier();
@ -135,7 +135,7 @@ void ScriptLexer::tokenize(MemoryBufferRef mb) {
} }
// Some operators form separate tokens. // Some operators form separate tokens.
if (s.startswith("<<=") || s.startswith(">>=")) { if (s.starts_with("<<=") || s.starts_with(">>=")) {
vec.push_back(s.substr(0, 3)); vec.push_back(s.substr(0, 3));
s = s.substr(3); s = s.substr(3);
continue; continue;
@ -167,7 +167,7 @@ void ScriptLexer::tokenize(MemoryBufferRef mb) {
// Skip leading whitespace characters or comments. // Skip leading whitespace characters or comments.
StringRef ScriptLexer::skipSpace(StringRef s) { StringRef ScriptLexer::skipSpace(StringRef s) {
for (;;) { for (;;) {
if (s.startswith("/*")) { if (s.starts_with("/*")) {
size_t e = s.find("*/", 2); size_t e = s.find("*/", 2);
if (e == StringRef::npos) { if (e == StringRef::npos) {
setError("unclosed comment in a linker script"); setError("unclosed comment in a linker script");
@ -176,7 +176,7 @@ StringRef ScriptLexer::skipSpace(StringRef s) {
s = s.substr(e + 2); s = s.substr(e + 2);
continue; continue;
} }
if (s.startswith("#")) { if (s.starts_with("#")) {
size_t e = s.find('\n', 1); size_t e = s.find('\n', 1);
if (e == StringRef::npos) if (e == StringRef::npos)
e = s.size() - 1; e = s.size() - 1;
@ -199,7 +199,7 @@ static std::vector<StringRef> tokenizeExpr(StringRef s) {
StringRef ops = "!~*/+-<>?:="; // List of operators StringRef ops = "!~*/+-<>?:="; // List of operators
// Quoted strings are literal strings, so we don't want to split it. // Quoted strings are literal strings, so we don't want to split it.
if (s.startswith("\"")) if (s.starts_with("\""))
return {s}; return {s};
// Split S with operators as separators. // Split S with operators as separators.
@ -219,9 +219,9 @@ static std::vector<StringRef> tokenizeExpr(StringRef s) {
// Get the operator as a token. // Get the operator as a token.
// Keep !=, ==, >=, <=, << and >> operators as a single tokens. // Keep !=, ==, >=, <=, << and >> operators as a single tokens.
if (s.substr(e).startswith("!=") || s.substr(e).startswith("==") || if (s.substr(e).starts_with("!=") || s.substr(e).starts_with("==") ||
s.substr(e).startswith(">=") || s.substr(e).startswith("<=") || s.substr(e).starts_with(">=") || s.substr(e).starts_with("<=") ||
s.substr(e).startswith("<<") || s.substr(e).startswith(">>")) { s.substr(e).starts_with("<<") || s.substr(e).starts_with(">>")) {
ret.push_back(s.substr(e, 2)); ret.push_back(s.substr(e, 2));
s = s.substr(e + 2); s = s.substr(e + 2);
} else { } else {

24
lld/ELF/ScriptParser.cpp
View File

@ -145,7 +145,7 @@ private:
} // namespace } // namespace
static StringRef unquote(StringRef s) { static StringRef unquote(StringRef s) {
if (s.startswith("\"")) if (s.starts_with("\""))
return s.substr(1, s.size() - 2); return s.substr(1, s.size() - 2);
return s; return s;
} }
@ -290,7 +290,7 @@ void ScriptParser::readDefsym(StringRef name) {
} }
void ScriptParser::addFile(StringRef s) { void ScriptParser::addFile(StringRef s) {
if (isUnderSysroot && s.startswith("/")) { if (isUnderSysroot && s.starts_with("/")) {
SmallString<128> pathData; SmallString<128> pathData;
StringRef path = (config->sysroot + s).toStringRef(pathData); StringRef path = (config->sysroot + s).toStringRef(pathData);
if (sys::fs::exists(path)) if (sys::fs::exists(path))
@ -300,17 +300,17 @@ void ScriptParser::addFile(StringRef s) {
return; return;
} }
if (s.startswith("/")) { if (s.starts_with("/")) {
// Case 1: s is an absolute path. Just open it. // Case 1: s is an absolute path. Just open it.
ctx.driver.addFile(s, /*withLOption=*/false); ctx.driver.addFile(s, /*withLOption=*/false);
} else if (s.startswith("=")) { } else if (s.starts_with("=")) {
// Case 2: relative to the sysroot. // Case 2: relative to the sysroot.
if (config->sysroot.empty()) if (config->sysroot.empty())
ctx.driver.addFile(s.substr(1), /*withLOption=*/false); ctx.driver.addFile(s.substr(1), /*withLOption=*/false);
else else
ctx.driver.addFile(saver().save(config->sysroot + "/" + s.substr(1)), ctx.driver.addFile(saver().save(config->sysroot + "/" + s.substr(1)),
/*withLOption=*/false); /*withLOption=*/false);
} else if (s.startswith("-l")) { } else if (s.starts_with("-l")) {
// Case 3: search in the list of library paths. // Case 3: search in the list of library paths.
ctx.driver.addLibrary(s.substr(2)); ctx.driver.addLibrary(s.substr(2));
} else { } else {
@ -628,7 +628,7 @@ void ScriptParser::readTarget() {
StringRef tok = unquote(next()); StringRef tok = unquote(next());
expect(")"); expect(")");
if (tok.startswith("elf")) if (tok.starts_with("elf"))
config->formatBinary = false; config->formatBinary = false;
else if (tok == "binary") else if (tok == "binary")
config->formatBinary = true; config->formatBinary = true;
@ -836,7 +836,7 @@ bool ScriptParser::readSectionDirective(OutputSection *cmd, StringRef tok1, Stri
// The value is a recognized literal SHT_*. // The value is a recognized literal SHT_*.
cmd->type = it->second; cmd->type = it->second;
skip(); skip();
} else if (value.startswith("SHT_")) { } else if (value.starts_with("SHT_")) {
setError("unknown section type " + value); setError("unknown section type " + value);
} else { } else {
// Otherwise, read an expression. // Otherwise, read an expression.
@ -983,7 +983,7 @@ OutputDesc *ScriptParser::readOutputSectionDescription(StringRef outSec) {
osec->phdrs = readOutputSectionPhdrs(); osec->phdrs = readOutputSectionPhdrs();
if (peek() == "=" || peek().startswith("=")) { if (peek() == "=" || peek().starts_with("=")) {
inExpr = true; inExpr = true;
consume("="); consume("=");
osec->filler = readFill(); osec->filler = readFill();
@ -1043,7 +1043,7 @@ SymbolAssignment *ScriptParser::readAssignment(StringRef tok) {
size_t oldPos = pos; size_t oldPos = pos;
SymbolAssignment *cmd = nullptr; SymbolAssignment *cmd = nullptr;
const StringRef op = peek(); const StringRef op = peek();
if (op.startswith("=")) { if (op.starts_with("=")) {
// Support = followed by an expression without whitespace. // Support = followed by an expression without whitespace.
SaveAndRestore saved(inExpr, true); SaveAndRestore saved(inExpr, true);
cmd = readSymbolAssignment(tok); cmd = readSymbolAssignment(tok);
@ -1529,7 +1529,7 @@ Expr ScriptParser::readPrimary() {
return [=] { return *val; }; return [=] { return *val; };
// Tok is a symbol name. // Tok is a symbol name.
if (tok.startswith("\"")) if (tok.starts_with("\""))
tok = unquote(tok); tok = unquote(tok);
else if (!isValidSymbolName(tok)) else if (!isValidSymbolName(tok))
setError("malformed number: " + tok); setError("malformed number: " + tok);
@ -1553,7 +1553,7 @@ Expr ScriptParser::readParenExpr() {
SmallVector<StringRef, 0> ScriptParser::readOutputSectionPhdrs() { SmallVector<StringRef, 0> ScriptParser::readOutputSectionPhdrs() {
SmallVector<StringRef, 0> phdrs; SmallVector<StringRef, 0> phdrs;
while (!errorCount() && peek().startswith(":")) { while (!errorCount() && peek().starts_with(":")) {
StringRef tok = next(); StringRef tok = next();
phdrs.push_back((tok.size() == 1) ? next() : tok.substr(1)); phdrs.push_back((tok.size() == 1) ? next() : tok.substr(1));
} }
@ -1680,7 +1680,7 @@ SmallVector<SymbolVersion, 0> ScriptParser::readVersionExtern() {
while (!errorCount() && peek() != "}") { while (!errorCount() && peek() != "}") {
StringRef tok = next(); StringRef tok = next();
ret.push_back( ret.push_back(
{unquote(tok), isCXX, !tok.startswith("\"") && hasWildcard(tok)}); {unquote(tok), isCXX, !tok.starts_with("\"") && hasWildcard(tok)});
if (consume("}")) if (consume("}"))
return ret; return ret;
expect(";"); expect(";");

4
lld/ELF/SyntheticSections.cpp
View File

@ -3154,7 +3154,7 @@ template <class ELFT> void VersionNeedSection<ELFT>::finalizeContents() {
verneeds.emplace_back(); verneeds.emplace_back();
Verneed &vn = verneeds.back(); Verneed &vn = verneeds.back();
vn.nameStrTab = getPartition().dynStrTab->addString(f->soName); vn.nameStrTab = getPartition().dynStrTab->addString(f->soName);
bool isLibc = config->relrGlibc && f->soName.startswith("libc.so."); bool isLibc = config->relrGlibc && f->soName.starts_with("libc.so.");
bool isGlibc2 = false; bool isGlibc2 = false;
for (unsigned i = 0; i != f->vernauxs.size(); ++i) { for (unsigned i = 0; i != f->vernauxs.size(); ++i) {
if (f->vernauxs[i] == 0) if (f->vernauxs[i] == 0)
@ -3162,7 +3162,7 @@ template <class ELFT> void VersionNeedSection<ELFT>::finalizeContents() {
auto *verdef = auto *verdef =
reinterpret_cast<const typename ELFT::Verdef *>(f->verdefs[i]); reinterpret_cast<const typename ELFT::Verdef *>(f->verdefs[i]);
StringRef ver(f->getStringTable().data() + verdef->getAux()->vda_name); StringRef ver(f->getStringTable().data() + verdef->getAux()->vda_name);
if (isLibc && ver.startswith("GLIBC_2.")) if (isLibc && ver.starts_with("GLIBC_2."))
isGlibc2 = true; isGlibc2 = true;
vn.vernauxs.push_back({verdef->vd_hash, f->vernauxs[i], vn.vernauxs.push_back({verdef->vd_hash, f->vernauxs[i],
getPartition().dynStrTab->addString(ver)}); getPartition().dynStrTab->addString(ver)});

2
lld/ELF/Writer.cpp
View File

@ -657,7 +657,7 @@ static bool shouldKeepInSymtab(const Defined &sym) {
// * --discard-locals is used. // * --discard-locals is used.
// * The symbol is in a SHF_MERGE section, which is normally the reason for // * The symbol is in a SHF_MERGE section, which is normally the reason for
// the assembler keeping the .L symbol. // the assembler keeping the .L symbol.
if (sym.getName().startswith(".L") && if (sym.getName().starts_with(".L") &&
(config->discard == DiscardPolicy::Locals || (config->discard == DiscardPolicy::Locals ||
(sym.section && (sym.section->flags & SHF_MERGE)))) (sym.section && (sym.section->flags & SHF_MERGE))))
return false; return false;

4
lld/MachO/Arch/ARM64Common.cpp
View File

@ -117,10 +117,10 @@ void ARM64Common::handleDtraceReloc(const Symbol *sym, const Reloc &r,
if (config->outputType == MH_OBJECT) if (config->outputType == MH_OBJECT)
return; return;
if (sym->getName().startswith("___dtrace_probe")) { if (sym->getName().starts_with("___dtrace_probe")) {
// change call site to a NOP // change call site to a NOP
write32le(loc, 0xD503201F); write32le(loc, 0xD503201F);
} else if (sym->getName().startswith("___dtrace_isenabled")) { } else if (sym->getName().starts_with("___dtrace_isenabled")) {
// change call site to 'MOVZ X0,0' // change call site to 'MOVZ X0,0'
write32le(loc, 0xD2800000); write32le(loc, 0xD2800000);
} else { } else {

4
lld/MachO/Arch/X86_64.cpp
View File

@ -231,11 +231,11 @@ void X86_64::handleDtraceReloc(const Symbol *sym, const Reloc &r,
if (config->outputType == MH_OBJECT) if (config->outputType == MH_OBJECT)
return; return;
if (sym->getName().startswith("___dtrace_probe")) { if (sym->getName().starts_with("___dtrace_probe")) {
// change call site to a NOP // change call site to a NOP
loc[-1] = 0x90; loc[-1] = 0x90;
write32le(loc, 0x00401F0F); write32le(loc, 0x00401F0F);
} else if (sym->getName().startswith("___dtrace_isenabled")) { } else if (sym->getName().starts_with("___dtrace_isenabled")) {
// change call site to a clear eax // change call site to a clear eax
loc[-1] = 0x33; loc[-1] = 0x33;
write32le(loc, 0x909090C0); write32le(loc, 0x909090C0);

12
lld/MachO/Driver.cpp
View File

@ -308,7 +308,7 @@ static InputFile *addFile(StringRef path, LoadType loadType,
bool isLCLinkerForceLoad = loadType == LoadType::LCLinkerOption && bool isLCLinkerForceLoad = loadType == LoadType::LCLinkerOption &&
config->forceLoadSwift && config->forceLoadSwift &&
path::filename(path).startswith("libswift"); path::filename(path).starts_with("libswift");
if ((isCommandLineLoad && config->allLoad) || if ((isCommandLineLoad && config->allLoad) ||
loadType == LoadType::CommandLineForce || isLCLinkerForceLoad) { loadType == LoadType::CommandLineForce || isLCLinkerForceLoad) {
if (std::optional<MemoryBufferRef> buffer = readFile(path)) { if (std::optional<MemoryBufferRef> buffer = readFile(path)) {
@ -336,7 +336,7 @@ static InputFile *addFile(StringRef path, LoadType loadType,
} }
} else if (isCommandLineLoad && config->forceLoadObjC) { } else if (isCommandLineLoad && config->forceLoadObjC) {
for (const object::Archive::Symbol &sym : file->getArchive().symbols()) for (const object::Archive::Symbol &sym : file->getArchive().symbols())
if (sym.getName().startswith(objc::klass)) if (sym.getName().starts_with(objc::klass))
file->fetch(sym); file->fetch(sym);
// TODO: no need to look for ObjC sections for a given archive member if // TODO: no need to look for ObjC sections for a given archive member if
@ -391,7 +391,7 @@ static InputFile *addFile(StringRef path, LoadType loadType,
if ((isa<ObjFile>(newFile) || isa<BitcodeFile>(newFile)) && newFile->lazy && if ((isa<ObjFile>(newFile) || isa<BitcodeFile>(newFile)) && newFile->lazy &&
config->forceLoadObjC) { config->forceLoadObjC) {
for (Symbol *sym : newFile->symbols) for (Symbol *sym : newFile->symbols)
if (sym && sym->getName().startswith(objc::klass)) { if (sym && sym->getName().starts_with(objc::klass)) {
extract(*newFile, "-ObjC"); extract(*newFile, "-ObjC");
break; break;
} }
@ -934,7 +934,7 @@ static std::vector<SectionAlign> parseSectAlign(const opt::InputArgList &args) {
StringRef segName = arg->getValue(0); StringRef segName = arg->getValue(0);
StringRef sectName = arg->getValue(1); StringRef sectName = arg->getValue(1);
StringRef alignStr = arg->getValue(2); StringRef alignStr = arg->getValue(2);
if (alignStr.startswith("0x") || alignStr.startswith("0X")) if (alignStr.starts_with("0x") || alignStr.starts_with("0X"))
alignStr = alignStr.drop_front(2); alignStr = alignStr.drop_front(2);
uint32_t align; uint32_t align;
if (alignStr.getAsInteger(16, align)) { if (alignStr.getAsInteger(16, align)) {
@ -1253,7 +1253,7 @@ static void addSynthenticMethnames() {
const int prefixLength = ObjCStubsSection::symbolPrefix.size(); const int prefixLength = ObjCStubsSection::symbolPrefix.size();
for (Symbol *sym : symtab->getSymbols()) for (Symbol *sym : symtab->getSymbols())
if (isa<Undefined>(sym)) if (isa<Undefined>(sym))
if (sym->getName().startswith(ObjCStubsSection::symbolPrefix)) if (sym->getName().starts_with(ObjCStubsSection::symbolPrefix))
os << sym->getName().drop_front(prefixLength) << '\0'; os << sym->getName().drop_front(prefixLength) << '\0';
if (data.empty()) if (data.empty())
@ -1480,7 +1480,7 @@ bool macho::link(ArrayRef<const char *> argsArr, llvm::raw_ostream &stdoutOS,
StringRef sep = sys::path::get_separator(); StringRef sep = sys::path::get_separator();
// real_path removes trailing slashes as part of the normalization, but // real_path removes trailing slashes as part of the normalization, but
// these are meaningful for our text based stripping // these are meaningful for our text based stripping
if (config->osoPrefix.equals(".") || config->osoPrefix.endswith(sep)) if (config->osoPrefix.equals(".") || config->osoPrefix.ends_with(sep))
expanded += sep; expanded += sep;
config->osoPrefix = saver().save(expanded.str()); config->osoPrefix = saver().save(expanded.str());
} }

2
lld/MachO/DriverUtils.cpp
View File

@ -275,7 +275,7 @@ macho::findPathCombination(const Twine &name,
} }
StringRef macho::rerootPath(StringRef path) { StringRef macho::rerootPath(StringRef path) {
if (!path::is_absolute(path, path::Style::posix) || path.endswith(".o")) if (!path::is_absolute(path, path::Style::posix) || path.ends_with(".o"))
return path; return path;
if (std::optional<StringRef> rerootedPath = if (std::optional<StringRef> rerootedPath =

10
lld/MachO/InputFiles.cpp
View File

@ -90,7 +90,7 @@ std::string lld::toString(const InputFile *f) {
// Multiple dylibs can be defined in one .tbd file. // Multiple dylibs can be defined in one .tbd file.
if (const auto *dylibFile = dyn_cast<DylibFile>(f)) if (const auto *dylibFile = dyn_cast<DylibFile>(f))
if (f->getName().endswith(".tbd")) if (f->getName().ends_with(".tbd"))
return (f->getName() + "(" + dylibFile->installName + ")").str(); return (f->getName() + "(" + dylibFile->installName + ")").str();
if (f->archiveName.empty()) if (f->archiveName.empty())
@ -1541,7 +1541,7 @@ static DylibFile *findDylib(StringRef path, DylibFile *umbrella,
StringRef stem = path::stem(path); StringRef stem = path::stem(path);
SmallString<128> frameworkName; SmallString<128> frameworkName;
path::append(frameworkName, path::Style::posix, stem + ".framework", stem); path::append(frameworkName, path::Style::posix, stem + ".framework", stem);
bool isFramework = path.endswith(frameworkName); bool isFramework = path.ends_with(frameworkName);
if (isFramework) { if (isFramework) {
for (StringRef dir : config->frameworkSearchPaths) { for (StringRef dir : config->frameworkSearchPaths) {
SmallString<128> candidate = dir; SmallString<128> candidate = dir;
@ -1580,7 +1580,7 @@ static DylibFile *findDylib(StringRef path, DylibFile *umbrella,
path::remove_filename(newPath); path::remove_filename(newPath);
path::append(newPath, path); path::append(newPath, path);
path = newPath; path = newPath;
} else if (path.startswith("@rpath/")) { } else if (path.starts_with("@rpath/")) {
for (StringRef rpath : umbrella->rpaths) { for (StringRef rpath : umbrella->rpaths) {
newPath.clear(); newPath.clear();
if (rpath.consume_front("@loader_path/")) { if (rpath.consume_front("@loader_path/")) {
@ -1949,7 +1949,7 @@ DylibFile *DylibFile::getSyntheticDylib(StringRef installName,
// name, compatibility version or hide/add symbols) for specific target // name, compatibility version or hide/add symbols) for specific target
// versions. // versions.
bool DylibFile::handleLDSymbol(StringRef originalName) { bool DylibFile::handleLDSymbol(StringRef originalName) {
if (!originalName.startswith("$ld$")) if (!originalName.starts_with("$ld$"))
return false; return false;
StringRef action; StringRef action;
@ -2059,7 +2059,7 @@ void DylibFile::handleLDInstallNameSymbol(StringRef name,
void DylibFile::handleLDHideSymbol(StringRef name, StringRef originalName) { void DylibFile::handleLDHideSymbol(StringRef name, StringRef originalName) {
StringRef symbolName; StringRef symbolName;
bool shouldHide = true; bool shouldHide = true;
if (name.startswith("os")) { if (name.starts_with("os")) {
// If it's hidden based on versions. // If it's hidden based on versions.
name = name.drop_front(2); name = name.drop_front(2);
StringRef minVersion; StringRef minVersion;

2
lld/MachO/InputSection.cpp
View File

@ -197,7 +197,7 @@ void ConcatInputSection::writeTo(uint8_t *buf) {
!referentSym->isInGot()) !referentSym->isInGot())
target->relaxGotLoad(loc, r.type); target->relaxGotLoad(loc, r.type);
// For dtrace symbols, do not handle them as normal undefined symbols // For dtrace symbols, do not handle them as normal undefined symbols
if (referentSym->getName().startswith("___dtrace_")) { if (referentSym->getName().starts_with("___dtrace_")) {
// Change dtrace call site to pre-defined instructions // Change dtrace call site to pre-defined instructions
target->handleDtraceReloc(referentSym, r, loc); target->handleDtraceReloc(referentSym, r, loc);
continue; continue;

2
lld/MachO/ObjC.cpp
View File

@ -43,7 +43,7 @@ template <class LP> static bool objectHasObjCSection(MemoryBufferRef mb) {
if ((segname == segment_names::data && if ((segname == segment_names::data &&
sectname == section_names::objcCatList) || sectname == section_names::objcCatList) ||
(segname == segment_names::text && (segname == segment_names::text &&
sectname.startswith(section_names::swift))) { sectname.starts_with(section_names::swift))) {
return true; return true;
} }
} }

4
lld/MachO/SymbolTable.cpp
View File

@ -385,7 +385,7 @@ static bool recoverFromUndefinedSymbol(const Undefined &sym) {
} }
// Leave dtrace symbols, since we will handle them when we do the relocation // Leave dtrace symbols, since we will handle them when we do the relocation
if (name.startswith("___dtrace_")) if (name.starts_with("___dtrace_"))
return true; return true;
// Handle -U. // Handle -U.
@ -530,7 +530,7 @@ static const Symbol *getAlternativeSpelling(const Undefined &sym,
// The reference may be a mangled name while the definition is not. Suggest a // The reference may be a mangled name while the definition is not. Suggest a
// missing extern "C". // missing extern "C".
if (name.startswith("__Z")) { if (name.starts_with("__Z")) {
std::string buf = name.str(); std::string buf = name.str();
llvm::ItaniumPartialDemangler d; llvm::ItaniumPartialDemangler d;
if (!d.partialDemangle(buf.c_str())) if (!d.partialDemangle(buf.c_str()))

2
lld/MachO/Symbols.h
View File

@ -386,7 +386,7 @@ inline bool needsBinding(const Symbol *sym) {
// Symbols with `l` or `L` as a prefix are linker-private and never appear in // Symbols with `l` or `L` as a prefix are linker-private and never appear in
// the output. // the output.
inline bool isPrivateLabel(StringRef name) { inline bool isPrivateLabel(StringRef name) {
return name.startswith("l") || name.startswith("L"); return name.starts_with("l") || name.starts_with("L");
} }
} // namespace macho } // namespace macho

2
lld/MachO/SyntheticSections.cpp
View File

@ -813,7 +813,7 @@ ObjCStubsSection::ObjCStubsSection()
} }
void ObjCStubsSection::addEntry(Symbol *sym) { void ObjCStubsSection::addEntry(Symbol *sym) {
assert(sym->getName().startswith(symbolPrefix) && "not an objc stub"); assert(sym->getName().starts_with(symbolPrefix) && "not an objc stub");
StringRef methname = sym->getName().drop_front(symbolPrefix.size()); StringRef methname = sym->getName().drop_front(symbolPrefix.size());
offsets.push_back( offsets.push_back(
in.objcMethnameSection->getStringOffset(methname).outSecOff); in.objcMethnameSection->getStringOffset(methname).outSecOff);

2
lld/MachO/Writer.cpp
View File

@ -731,7 +731,7 @@ void Writer::scanSymbols() {
dysym->getFile()->refState = dysym->getFile()->refState =
std::max(dysym->getFile()->refState, dysym->getRefState()); std::max(dysym->getFile()->refState, dysym->getRefState());
} else if (isa<Undefined>(sym)) { } else if (isa<Undefined>(sym)) {
if (sym->getName().startswith(ObjCStubsSection::symbolPrefix)) if (sym->getName().starts_with(ObjCStubsSection::symbolPrefix))
in.objcStubs->addEntry(sym); in.objcStubs->addEntry(sym);
} }
} }

4
lld/MinGW/Driver.cpp
View File

@ -127,7 +127,7 @@ static std::optional<std::string> findFile(StringRef path1,
// This is for -lfoo. We'll look for libfoo.dll.a or libfoo.a from search paths. // This is for -lfoo. We'll look for libfoo.dll.a or libfoo.a from search paths.
static std::string static std::string
searchLibrary(StringRef name, ArrayRef<StringRef> searchPaths, bool bStatic) { searchLibrary(StringRef name, ArrayRef<StringRef> searchPaths, bool bStatic) {
if (name.startswith(":")) { if (name.starts_with(":")) {
for (StringRef dir : searchPaths) for (StringRef dir : searchPaths)
if (std::optional<std::string> s = findFile(dir, name.substr(1))) if (std::optional<std::string> s = findFile(dir, name.substr(1)))
return *s; return *s;
@ -204,7 +204,7 @@ bool mingw::link(ArrayRef<const char *> argsArr, llvm::raw_ostream &stdoutOS,
if (auto *a = args.getLastArg(OPT_entry)) { if (auto *a = args.getLastArg(OPT_entry)) {
StringRef s = a->getValue(); StringRef s = a->getValue();
if (args.getLastArgValue(OPT_m) == "i386pe" && s.startswith("_")) if (args.getLastArgValue(OPT_m) == "i386pe" && s.starts_with("_"))
add("-entry:" + s.substr(1)); add("-entry:" + s.substr(1));
else else
add("-entry:" + s); add("-entry:" + s);

6
lld/wasm/Driver.cpp
View File

@ -314,7 +314,7 @@ static std::optional<std::string> searchLibraryBaseName(StringRef name) {
// This is for -l<namespec>. // This is for -l<namespec>.
static std::optional<std::string> searchLibrary(StringRef name) { static std::optional<std::string> searchLibrary(StringRef name) {
if (name.startswith(":")) if (name.starts_with(":"))
return findFromSearchPaths(name.substr(1)); return findFromSearchPaths(name.substr(1));
return searchLibraryBaseName(name); return searchLibraryBaseName(name);
} }
@ -409,7 +409,7 @@ getBuildId(opt::InputArgList &args) {
return {BuildIdKind::Sha1, {}}; return {BuildIdKind::Sha1, {}};
if (s == "uuid") if (s == "uuid")
return {BuildIdKind::Uuid, {}}; return {BuildIdKind::Uuid, {}};
if (s.startswith("0x")) if (s.starts_with("0x"))
return {BuildIdKind::Hexstring, parseHex(s.substr(2))}; return {BuildIdKind::Hexstring, parseHex(s.substr(2))};
if (s != "none") if (s != "none")
@ -1073,7 +1073,7 @@ static void splitSections() {
static bool isKnownZFlag(StringRef s) { static bool isKnownZFlag(StringRef s) {
// For now, we only support a very limited set of -z flags // For now, we only support a very limited set of -z flags
return s.startswith("stack-size="); return s.starts_with("stack-size=");
} }
// Report a warning for an unknown -z option. // Report a warning for an unknown -z option.

2
lld/wasm/InputChunks.cpp
View File

@ -521,7 +521,7 @@ uint64_t InputSection::getTombstoneForSection(StringRef name) {
// meaning of -1 so we use -2. // meaning of -1 so we use -2.
// Returning 0 means there is no tombstone value for this section, and relocation // Returning 0 means there is no tombstone value for this section, and relocation
// will just use the addend. // will just use the addend.
if (!name.startswith(".debug_")) if (!name.starts_with(".debug_"))
return 0; return 0;
if (name.equals(".debug_ranges") || name.equals(".debug_loc")) if (name.equals(".debug_ranges") || name.equals(".debug_loc"))
return UINT64_C(-2); return UINT64_C(-2);

4
lld/wasm/InputFiles.cpp
View File

@ -487,7 +487,7 @@ void ObjFile::parse(bool ignoreComdats) {
// relied on the naming convention. To maintain compat with such objects // relied on the naming convention. To maintain compat with such objects
// we still imply the TLS flag based on the name of the segment. // we still imply the TLS flag based on the name of the segment.
if (!seg->isTLS() && if (!seg->isTLS() &&
(seg->name.startswith(".tdata") || seg->name.startswith(".tbss"))) (seg->name.starts_with(".tdata") || seg->name.starts_with(".tbss")))
seg->flags |= WASM_SEG_FLAG_TLS; seg->flags |= WASM_SEG_FLAG_TLS;
segments.emplace_back(seg); segments.emplace_back(seg);
} }
@ -705,7 +705,7 @@ void StubFile::parse() {
} }
// Lines starting with # are considered comments // Lines starting with # are considered comments
if (line.startswith("#")) if (line.starts_with("#"))
continue; continue;
StringRef sym; StringRef sym;

14
lld/wasm/Writer.cpp
View File

@ -141,7 +141,7 @@ void Writer::calculateCustomSections() {
// These custom sections are known the linker and synthesized rather than // These custom sections are known the linker and synthesized rather than
// blindly copied. // blindly copied.
if (name == "linking" || name == "name" || name == "producers" || if (name == "linking" || name == "name" || name == "producers" ||
name == "target_features" || name.startswith("reloc.")) name == "target_features" || name.starts_with("reloc."))
continue; continue;
// These custom sections are generated by `clang -fembed-bitcode`. // These custom sections are generated by `clang -fembed-bitcode`.
// These are used by the rust toolchain to ship LTO data along with // These are used by the rust toolchain to ship LTO data along with
@ -150,7 +150,7 @@ void Writer::calculateCustomSections() {
if (name == ".llvmbc" || name == ".llvmcmd") if (name == ".llvmbc" || name == ".llvmcmd")
continue; continue;
// Strip debug section in that option was specified. // Strip debug section in that option was specified.
if (stripDebug && name.startswith(".debug_")) if (stripDebug && name.starts_with(".debug_"))
continue; continue;
// Otherwise include custom sections by default and concatenate their // Otherwise include custom sections by default and concatenate their
// contents. // contents.
@ -992,13 +992,13 @@ static StringRef getOutputDataSegmentName(const InputChunk &seg) {
return ".tdata"; return ".tdata";
if (!config->mergeDataSegments) if (!config->mergeDataSegments)
return seg.name; return seg.name;
if (seg.name.startswith(".text.")) if (seg.name.starts_with(".text."))
return ".text"; return ".text";
if (seg.name.startswith(".data.")) if (seg.name.starts_with(".data."))
return ".data"; return ".data";
if (seg.name.startswith(".bss.")) if (seg.name.starts_with(".bss."))
return ".bss"; return ".bss";
if (seg.name.startswith(".rodata.")) if (seg.name.starts_with(".rodata."))
return ".rodata"; return ".rodata";
return seg.name; return seg.name;
} }
@ -1008,7 +1008,7 @@ OutputSegment *Writer::createOutputSegment(StringRef name) {
OutputSegment *s = make<OutputSegment>(name); OutputSegment *s = make<OutputSegment>(name);
if (config->sharedMemory) if (config->sharedMemory)
s->initFlags = WASM_DATA_SEGMENT_IS_PASSIVE; s->initFlags = WASM_DATA_SEGMENT_IS_PASSIVE;
if (!config->relocatable && name.startswith(".bss")) if (!config->relocatable && name.starts_with(".bss"))
s->isBss = true; s->isBss = true;
segments.push_back(s); segments.push_back(s);
return s; return s;