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

ABI/API checker: serialized json format should include all tool invocation arguments

Browse Source
This commit is contained in:
Xi Ge
2019-08-19 12:10:57 -07:00
parent a2b882674d
commit 6a65a01e8a
6 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/swift-api-digester/swift-api-digester.cpp
View File

@@ -206,6 +206,11 @@ AvoidLocation("avoid-location",
llvm::cl::desc("Avoid serializing the file paths of SDK nodes."),
llvm::cl::cat(Category));
static llvm::cl::opt<bool>
AvoidToolArgs("avoid-tool-args",
llvm::cl::desc("Avoid serializing the arguments for invoking the tool."),
llvm::cl::cat(Category));
static llvm::cl::opt<std::string>
LocationFilter("location",
llvm::cl::desc("Filter nodes with the given location."),
@@ -2443,9 +2448,10 @@ static int deserializeNameCorrection(APIDiffItemStore &Store,
return EC.value();
}
static CheckerOptions getCheckOpts() {
static CheckerOptions getCheckOpts(int argc, char *argv[]) {
CheckerOptions Opts;
Opts.AvoidLocation = options::AvoidLocation;
Opts.AvoidToolArgs = options::AvoidToolArgs;
Opts.ABI = options::Abi;
Opts.Verbose = options::Verbose;
Opts.AbortOnModuleLoadFailure = options::AbortOnModuleLoadFailure;
@@ -2453,6 +2459,8 @@ static CheckerOptions getCheckOpts() {
Opts.PrintModule = options::PrintModule;
Opts.SwiftOnly = options::SwiftOnly;
Opts.SkipOSCheck = options::DisableOSChecks;
for (int i = 1; i < argc; ++i)
Opts.ToolArgs.push_back(StringRef(argv[i]));
return Opts;
}
@@ -2482,7 +2490,7 @@ int main(int argc, char *argv[]) {
std::vector<std::string> PrintApis;
llvm::StringSet<> IgnoredUsrs;
readIgnoredUsrs(IgnoredUsrs);
CheckerOptions Opts = getCheckOpts();
CheckerOptions Opts = getCheckOpts(argc, argv);
for (auto Name : options::ApisPrintUsrs)
PrintApis.push_back(Name);
switch (options::Action) {