Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-01-05 15:42:24 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Use llvm::Optional instead of a magic number -1 to represent "no result".

Browse Source 
llvm-svn: 315166
This commit is contained in:
Rui Ueyama 2017-10-08 02:44:08 +00:00
parent 617e2f98a0
commit 872235743d
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lld/ELF/LinkerScript.cpp
View File

@ -871,17 +871,13 @@ ExprValue LinkerScript::getSymbolValue(const Twine &Loc, StringRef S) {
return 0;
}
static const size_t NoPhdr = -1;
// Returns indices of ELF headers containing specific section. Each index is a
// zero based number of ELF header listed within PHDRS {} script block.
std::vector<size_t> LinkerScript::getPhdrIndices(OutputSection *Cmd) {
std::vector<size_t> Ret;
for (StringRef PhdrName : Cmd->Phdrs) {
size_t Index = getPhdrIndex(Cmd->Location, PhdrName);
if (Index != NoPhdr)
Ret.push_back(Index);
}
for (StringRef PhdrName : Cmd->Phdrs)
if (Optional<size_t> Idx = getPhdrIndex(Cmd->Location, PhdrName))
Ret.push_back(*Idx);
return Ret;
}
@ -889,14 +885,13 @@ std::vector<size_t> LinkerScript::getPhdrIndices(OutputSection *Cmd) {
// NoPhdr. When not found, if PhdrName is not the special case value 'NONE'
// (which can be used to explicitly specify that a section isn't assigned to a
// segment) then error.
size_t LinkerScript::getPhdrIndex(const Twine &Loc, StringRef PhdrName) {
size_t I = 0;
for (PhdrsCommand &Cmd : Opt.PhdrsCommands) {
if (Cmd.Name == PhdrName)
Optional<size_t> LinkerScript::getPhdrIndex(const Twine &Loc,
StringRef PhdrName) {
for (size_t I = 0; I < Opt.PhdrsCommands.size(); ++I)
if (Opt.PhdrsCommands[I].Name == PhdrName)
return I;
++I;
}
if (PhdrName != "NONE")
error(Loc + ": section header '" + PhdrName + "' is not listed in PHDRS");
return NoPhdr;
return None;
}

2
lld/ELF/LinkerScript.h
View File

@ -217,7 +217,7 @@ class LinkerScript final {
std::vector<InputSectionBase *> createInputSectionList(OutputSection &Cmd);
std::vector<size_t> getPhdrIndices(OutputSection *Sec);
size_t getPhdrIndex(const Twine &Loc, StringRef PhdrName);
llvm::Optional<size_t> getPhdrIndex(const Twine &Loc, StringRef PhdrName);
MemoryRegion *findMemoryRegion(OutputSection *Sec);