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

Revert "clang-tidy and clang-query wont crash with invalid command line options" 

This reverts commit f23ddbe3c3.
This commit is contained in:
Nathan James 2020-05-31 16:40:09 +01:00
parent dfbfdc96f9
commit f4b0ebb89b
4 changed files with 7 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
clang-tools-extra/clang-query/tool/ClangQuery.cpp
View File

@ -35,7 +35,6 @@
#include "llvm/Support/CommandLine.h" #include "llvm/Support/CommandLine.h"
#include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/Signals.h" #include "llvm/Support/Signals.h"
#include "llvm/Support/WithColor.h"
#include <fstream> #include <fstream>
#include <string> #include <string>
@ -87,14 +86,7 @@ bool runCommandsInFile(const char *ExeName, std::string const &FileName,
int main(int argc, const char **argv) { int main(int argc, const char **argv) {
llvm::sys::PrintStackTraceOnErrorSignal(argv[0]); llvm::sys::PrintStackTraceOnErrorSignal(argv[0]);
llvm::Expected<CommonOptionsParser> OptionsParser = CommonOptionsParser OptionsParser(argc, argv, ClangQueryCategory);
CommonOptionsParser::create(argc, argv, ClangQueryCategory,
llvm::cl::OneOrMore);
if (!OptionsParser) {
llvm::WithColor::error() << llvm::toString(OptionsParser.takeError());
return 1;
}
if (!Commands.empty() && !CommandFiles.empty()) { if (!Commands.empty() && !CommandFiles.empty()) {
llvm::errs() << argv[0] << ": cannot specify both -c and -f\n"; llvm::errs() << argv[0] << ": cannot specify both -c and -f\n";
@ -107,8 +99,8 @@ int main(int argc, const char **argv) {
return 1; return 1;
} }
ClangTool Tool(OptionsParser->getCompilations(), ClangTool Tool(OptionsParser.getCompilations(),
OptionsParser->getSourcePathList()); OptionsParser.getSourcePathList());
std::vector<std::unique_ptr<ASTUnit>> ASTs; std::vector<std::unique_ptr<ASTUnit>> ASTs;
int Status = Tool.buildASTs(ASTs); int Status = Tool.buildASTs(ASTs);
int ASTStatus = 0; int ASTStatus = 0;

15
clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp
View File

@ -23,7 +23,6 @@
#include "llvm/Support/Process.h" #include "llvm/Support/Process.h"
#include "llvm/Support/Signals.h" #include "llvm/Support/Signals.h"
#include "llvm/Support/TargetSelect.h" #include "llvm/Support/TargetSelect.h"
#include "llvm/Support/WithColor.h"
using namespace clang::ast_matchers; using namespace clang::ast_matchers;
using namespace clang::driver; using namespace clang::driver;
@ -334,14 +333,8 @@ getVfsFromFile(const std::string &OverlayFile,
int clangTidyMain(int argc, const char **argv) { int clangTidyMain(int argc, const char **argv) {
llvm::InitLLVM X(argc, argv); llvm::InitLLVM X(argc, argv);
llvm::Expected<CommonOptionsParser> OptionsParser = CommonOptionsParser OptionsParser(argc, argv, ClangTidyCategory,
CommonOptionsParser::create(argc, argv, ClangTidyCategory, cl::ZeroOrMore);
cl::ZeroOrMore);
if (!OptionsParser) {
llvm::WithColor::error() << llvm::toString(OptionsParser.takeError());
return 1;
}
llvm::IntrusiveRefCntPtr<vfs::OverlayFileSystem> BaseFS( llvm::IntrusiveRefCntPtr<vfs::OverlayFileSystem> BaseFS(
new vfs::OverlayFileSystem(vfs::getRealFileSystem())); new vfs::OverlayFileSystem(vfs::getRealFileSystem()));
@ -372,7 +365,7 @@ int clangTidyMain(int argc, const char **argv) {
SmallString<256> ProfilePrefix = MakeAbsolute(StoreCheckProfile); SmallString<256> ProfilePrefix = MakeAbsolute(StoreCheckProfile);
StringRef FileName("dummy"); StringRef FileName("dummy");
auto PathList = OptionsParser->getSourcePathList(); auto PathList = OptionsParser.getSourcePathList();
if (!PathList.empty()) { if (!PathList.empty()) {
FileName = PathList.front(); FileName = PathList.front();
} }
@ -440,7 +433,7 @@ int clangTidyMain(int argc, const char **argv) {
ClangTidyContext Context(std::move(OwningOptionsProvider), ClangTidyContext Context(std::move(OwningOptionsProvider),
AllowEnablingAnalyzerAlphaCheckers); AllowEnablingAnalyzerAlphaCheckers);
std::vector<ClangTidyError> Errors = std::vector<ClangTidyError> Errors =
runClangTidy(Context, OptionsParser->getCompilations(), PathList, BaseFS, runClangTidy(Context, OptionsParser.getCompilations(), PathList, BaseFS,
EnableCheckProfile, ProfilePrefix); EnableCheckProfile, ProfilePrefix);
bool FoundErrors = llvm::find_if(Errors, [](const ClangTidyError &E) { bool FoundErrors = llvm::find_if(Errors, [](const ClangTidyError &E) {
return E.DiagLevel == ClangTidyError::Error; return E.DiagLevel == ClangTidyError::Error;

4
clang-tools-extra/test/clang-query/invalid-command-line.cpp
View File

@ -1,4 +0,0 @@
// RUN: not clang-query --invalid-arg 2>&1 | FileCheck %s
// CHECK: error: [CommonOptionsParser]: clang-query: Unknown command line argument '--invalid-arg'. Try: 'clang-query --help'
// CHECK-NEXT: clang-query: Did you mean '--extra-arg'?

4
clang-tools-extra/test/clang-tidy/infrastructure/invalid-command-line.cpp
View File

@ -1,4 +0,0 @@
// RUN: not clang-tidy --invalid-arg 2>&1 | FileCheck %s
// CHECK: error: [CommonOptionsParser]: clang-tidy: Unknown command line argument '--invalid-arg'. Try: 'clang-tidy --help'
// CHECK-NEXT: clang-tidy: Did you mean '--extra-arg'?