Skip to content

Commit 51fb76f

Browse files
[lld] Use StringRef::consume_front_insensitive (NFC)
1 parent fc2766c commit 51fb76f

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

lld/COFF/DriverUtils.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -310,13 +310,11 @@ void LinkerDriver::parseManifestUAC(StringRef arg) {
310310
arg = arg.ltrim();
311311
if (arg.empty())
312312
return;
313-
if (arg.starts_with_insensitive("level=")) {
314-
arg = arg.substr(strlen("level="));
313+
if (arg.consume_front_insensitive("level=")) {
315314
std::tie(ctx.config.manifestLevel, arg) = arg.split(" ");
316315
continue;
317316
}
318-
if (arg.starts_with_insensitive("uiaccess=")) {
319-
arg = arg.substr(strlen("uiaccess="));
317+
if (arg.consume_front_insensitive("uiaccess=")) {
320318
std::tie(ctx.config.manifestUIAccess, arg) = arg.split(" ");
321319
continue;
322320
}

lld/Common/Args.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ static int64_t getInteger(opt::InputArgList &args, unsigned key,
3131

3232
int64_t v;
3333
StringRef s = a->getValue();
34-
if (base == 16 && (s.starts_with("0x") || s.starts_with("0X")))
35-
s = s.drop_front(2);
34+
if (base == 16)
35+
s.consume_front_insensitive("0x");
3636
if (to_integer(s, v, base))
3737
return v;
3838

lld/MachO/Driver.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -952,8 +952,7 @@ static std::vector<SectionAlign> parseSectAlign(const opt::InputArgList &args) {
952952
StringRef segName = arg->getValue(0);
953953
StringRef sectName = arg->getValue(1);
954954
StringRef alignStr = arg->getValue(2);
955-
if (alignStr.starts_with("0x") || alignStr.starts_with("0X"))
956-
alignStr = alignStr.drop_front(2);
955+
alignStr.consume_front_insensitive("0x");
957956
uint32_t align;
958957
if (alignStr.getAsInteger(16, align)) {
959958
error("-sectalign: failed to parse '" + StringRef(arg->getValue(2)) +

0 commit comments

Comments
 (0)