aboutsummaryrefslogtreecommitdiff
path: root/llvm/tools/llvm-ifs/llvm-ifs.cpp
diff options
context:
space:
mode:
authorKrzysztof Parzyszek <kparzysz@quicinc.com>2022-12-05 15:19:30 -0800
committerKrzysztof Parzyszek <kparzysz@quicinc.com>2022-12-06 12:49:32 -0800
commitc589730ad5286fc784b8aacf2f0214149603f312 (patch)
tree7ef2fd8ada8da288c13d257707715f3ba79a9274 /llvm/tools/llvm-ifs/llvm-ifs.cpp
parent48634b3b935fd0bb325c08fce6313fadcdcb6f86 (diff)
downloadllvm-c589730ad5286fc784b8aacf2f0214149603f312.zip
llvm-c589730ad5286fc784b8aacf2f0214149603f312.tar.gz
llvm-c589730ad5286fc784b8aacf2f0214149603f312.tar.bz2
[YAML] Convert Optional to std::optional
Diffstat (limited to 'llvm/tools/llvm-ifs/llvm-ifs.cpp')
-rw-r--r--llvm/tools/llvm-ifs/llvm-ifs.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/llvm/tools/llvm-ifs/llvm-ifs.cpp b/llvm/tools/llvm-ifs/llvm-ifs.cpp
index d704422..89b495b 100644
--- a/llvm/tools/llvm-ifs/llvm-ifs.cpp
+++ b/llvm/tools/llvm-ifs/llvm-ifs.cpp
@@ -84,14 +84,14 @@ public:
struct DriverConfig {
std::vector<std::string> InputFilePaths;
- Optional<FileFormat> InputFormat;
- Optional<FileFormat> OutputFormat;
+ std::optional<FileFormat> InputFormat;
+ std::optional<FileFormat> OutputFormat;
std::optional<std::string> HintIfsTarget;
- Optional<std::string> OptTargetTriple;
- Optional<IFSArch> OverrideArch;
- Optional<IFSBitWidthType> OverrideBitWidth;
- Optional<IFSEndiannessType> OverrideEndianness;
+ std::optional<std::string> OptTargetTriple;
+ std::optional<IFSArch> OverrideArch;
+ std::optional<IFSBitWidthType> OverrideBitWidth;
+ std::optional<IFSEndiannessType> OverrideEndianness;
bool StripIfsArch = false;
bool StripIfsBitwidth = false;
@@ -130,7 +130,7 @@ static std::string getTypeName(IFSSymbolType Type) {
}
static Expected<std::unique_ptr<IFSStub>>
-readInputFile(Optional<FileFormat> &InputFormat, StringRef FilePath) {
+readInputFile(std::optional<FileFormat> &InputFormat, StringRef FilePath) {
// Read in file.
ErrorOr<std::unique_ptr<MemoryBuffer>> BufOrError =
MemoryBuffer::getFileOrSTDIN(FilePath, /*IsText=*/true);
@@ -306,7 +306,7 @@ static DriverConfig parseArgs(int argc, char *const *argv) {
for (const opt::Arg *A : Args.filtered(OPT_INPUT))
Config.InputFilePaths.push_back(A->getValue());
if (const opt::Arg *A = Args.getLastArg(OPT_input_format_EQ)) {
- Config.InputFormat = StringSwitch<Optional<FileFormat>>(A->getValue())
+ Config.InputFormat = StringSwitch<std::optional<FileFormat>>(A->getValue())
.Case("IFS", FileFormat::IFS)
.Case("ELF", FileFormat::ELF)
.Default(std::nullopt);
@@ -319,7 +319,7 @@ static DriverConfig parseArgs(int argc, char *const *argv) {
" option: Cannot find option named '" + OptionName + "'!");
};
if (const opt::Arg *A = Args.getLastArg(OPT_output_format_EQ)) {
- Config.OutputFormat = StringSwitch<Optional<FileFormat>>(A->getValue())
+ Config.OutputFormat = StringSwitch<std::optional<FileFormat>>(A->getValue())
.Case("IFS", FileFormat::IFS)
.Case("ELF", FileFormat::ELF)
.Case("TBD", FileFormat::TBD)
@@ -341,7 +341,7 @@ static DriverConfig parseArgs(int argc, char *const *argv) {
}
if (const opt::Arg *A = Args.getLastArg(OPT_endianness_EQ)) {
Config.OverrideEndianness =
- StringSwitch<Optional<IFSEndiannessType>>(A->getValue())
+ StringSwitch<std::optional<IFSEndiannessType>>(A->getValue())
.Case("little", IFSEndiannessType::Little)
.Case("big", IFSEndiannessType::Big)
.Default(std::nullopt);