averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update OptTable in swift_cache_tool to use new LLVM OptTable APIs

Browse Source 
Fix OptTable for upstream llvm/main.

rdar://112418691
This commit is contained in:
Steven Wu
2023-07-17 13:50:57 -07:00
parent 27b32162e1
commit ae519b906d
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/DriverTool/swift_cache_tool_main.cpp
View File

@@ -63,7 +63,10 @@ enum ID {
#undef OPTION
};
#define PREFIX(NAME, VALUE) static const char *const NAME[] = VALUE;
#define PREFIX(NAME, VALUE) \
constexpr llvm::StringLiteral NAME##_init[] = VALUE; \
constexpr llvm::ArrayRef<llvm::StringLiteral> NAME( \
NAME##_init, std::size(NAME##_init) - 1);
#include "SwiftCacheToolOptions.inc"
#undef PREFIX
@@ -76,9 +79,9 @@ static const OptTable::Info InfoTable[] = {
#undef OPTION
};
class CacheToolOptTable : public llvm::opt::OptTable {
class CacheToolOptTable : public llvm::opt::GenericOptTable {
public:
CacheToolOptTable() : OptTable(InfoTable) {}
CacheToolOptTable() : GenericOptTable(InfoTable) {}
};
class SwiftCacheToolInvocation {
@@ -98,18 +101,14 @@ public:
Instance.addDiagnosticConsumer(&PDC);
}
std::unique_ptr<llvm::opt::OptTable> createOptTable() {
return std::unique_ptr<OptTable>(new CacheToolOptTable());
}
int parseArgs(ArrayRef<const char *> Args) {
auto &Diags = Instance.getDiags();
std::unique_ptr<llvm::opt::OptTable> Table = createOptTable();
CacheToolOptTable Table;
unsigned MissingIndex;
unsigned MissingCount;
llvm::opt::InputArgList ParsedArgs =
Table->ParseArgs(Args, MissingIndex, MissingCount);
Table.ParseArgs(Args, MissingIndex, MissingCount);
if (MissingCount) {
Diags.diagnose(SourceLoc(), diag::error_missing_arg_value,
ParsedArgs.getArgString(MissingIndex), MissingCount);
@@ -119,8 +118,8 @@ public:
if (ParsedArgs.getLastArg(OPT_help)) {
std::string ExecutableName =
llvm::sys::path::stem(MainExecutablePath).str();
Table->printHelp(llvm::outs(), ExecutableName.c_str(), "Swift Cache Tool",
0, 0, /*ShowAllAliases*/ false);
Table.printHelp(llvm::outs(), ExecutableName.c_str(), "Swift Cache Tool",
0, 0, /*ShowAllAliases*/ false);
return 0;
}