replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ELF: Use llvm::Optional<StringRef> instead of a bool and a StringRef. 

llvm-svn: 233442
This commit is contained in:
Rui Ueyama 2015-03-27 22:51:50 +00:00
parent a57f619133
commit d5c60d032f
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lld/include/lld/ReaderWriter/ELFLinkingContext.h
View File

@ -128,8 +128,8 @@ public:
/// \brief The dynamic linker path set by the --dynamic-linker option
StringRef getInterpreter() const {
if (_dynamicLinkerArg)
return _dynamicLinkerPath;
if (_dynamicLinkerPath.hasValue())
return _dynamicLinkerPath.getValue();
return getDefaultInterpreter();
}
@ -166,10 +166,7 @@ public:
void finalizeInputFiles() override;
/// \brief Set the dynamic linker path
void setInterpreter(StringRef dynamicLinker) {
_dynamicLinkerArg = true;
_dynamicLinkerPath = dynamicLinker;
}
void setInterpreter(StringRef s) { _dynamicLinkerPath = s; }
/// \brief Set NMAGIC output kind when the linker specifies --nmagic
/// or -n in the command line
@ -311,7 +308,7 @@ protected:
OutputMagic _outputMagic;
StringRefVector _inputSearchPaths;
std::unique_ptr<Writer> _writer;
StringRef _dynamicLinkerPath;
llvm::Optional<StringRef> _dynamicLinkerPath;
StringRef _initFunction = "_init";
StringRef _finiFunction = "_fini";
StringRef _sysrootPath = "";