This is an archive of the discontinued LLVM Phabricator instance.

Use StringRef::split instead of StringRef::find and StringRef::substr.
ClosedPublic

Authored by ruiu on Jun 13 2017, 8:44 PM.

Reviewers

Commits

Summary

Pointed out by Yuka Takahashi.

LGTM

This revision is now accepted and ready to land.Jun 13 2017, 8:54 PM

This revision was automatically updated to reflect the committed changes.

Path

Size

lld/

trunk/

ELF/

10 lines

Show First 20 Lines • Show All 300 Lines • ▼ Show 20 Lines	for (auto *Arg : Args.filtered(OPT_z))
if (Key == Arg->getValue())		if (Key == Arg->getValue())
return true;		return true;
return false;		return false;
}		}

static uint64_t getZOptionValue(opt::InputArgList &Args, StringRef Key,		static uint64_t getZOptionValue(opt::InputArgList &Args, StringRef Key,
uint64_t Default) {		uint64_t Default) {
for (auto *Arg : Args.filtered(OPT_z)) {		for (auto *Arg : Args.filtered(OPT_z)) {
StringRef Value = Arg->getValue();		std::pair<StringRef, StringRef> KV = StringRef(Arg->getValue()).split('=');
size_t Pos = Value.find("=");		if (KV.first == Key) {
if (Pos != StringRef::npos && Key == Value.substr(0, Pos)) {
Value = Value.substr(Pos + 1);
uint64_t Result;		uint64_t Result;
if (!to_integer(Value, Result))		if (!to_integer(KV.second, Result))
error("invalid " + Key + ": " + Value);		error("invalid " + Key + ": " + KV.second);
return Result;		return Result;
}		}
}		}
return Default;		return Default;
}		}

void LinkerDriver::main(ArrayRef<const char *> ArgsArr, bool CanExitEarly) {		void LinkerDriver::main(ArrayRef<const char *> ArgsArr, bool CanExitEarly) {
ELFOptTable Parser;		ELFOptTable Parser;
▲ Show 20 Lines • Show All 697 Lines • Show Last 20 Lines