maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Slightly less blindly fixing clang-tools-extra now that I remember that the "check-clang" target doesn't check clang-tools-extra 

llvm-svn: 207231
This commit is contained in:
David Blaikie 2014-04-25 15:21:43 +00:00
parent 329be894f1
commit 35013fa390
3 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clang-tools-extra/clang-query/Query.cpp
View File

@ -59,10 +59,7 @@ struct CollectBoundNodes : MatchFinder::MatchCallback {
bool MatchQuery::run(llvm::raw_ostream &OS, QuerySession &QS) const {
unsigned MatchCount = 0;
for (llvm::ArrayRef<ASTUnit *>::iterator I = QS.ASTs.begin(),
E = QS.ASTs.end();
I != E; ++I) {
ASTUnit *AST = *I;
for (auto &AST : QS.ASTs) {
MatchFinder Finder;
std::vector<BoundNodes> Matches;
DynTypedMatcher MaybeBoundMatcher = Matcher;

23
clang-tools-extra/unittests/clang-query/QueryEngineTest.cpp
View File

@ -26,23 +26,22 @@ using namespace clang::query;
using namespace clang::tooling;
class QueryEngineTest : public ::testing::Test {
ArrayRef<ASTUnit *> mkASTUnit2(ASTUnit *a, ASTUnit *b) {
ASTs[0] = a;
ASTs[1] = b;
return ArrayRef<ASTUnit *>(ASTs);
ArrayRef<std::unique_ptr<ASTUnit>> mkASTUnit2(std::unique_ptr<ASTUnit> a,
std::unique_ptr<ASTUnit> b) {
ASTs[0] = std::move(a);
ASTs[1] = std::move(b);
return ArrayRef<std::unique_ptr<ASTUnit>>(ASTs);
}
protected:
QueryEngineTest()
: FooAST(buildASTFromCode("void foo1(void) {}\nvoid foo2(void) {}",
"foo.cc")),
BarAST(buildASTFromCode("void bar1(void) {}\nvoid bar2(void) {}",
"bar.cc")),
S(mkASTUnit2(FooAST.get(), BarAST.get())), OS(Str) {}
: S(mkASTUnit2(std::unique_ptr<ASTUnit>(buildASTFromCode(
"void foo1(void) {}\nvoid foo2(void) {}", "foo.cc")),
std::unique_ptr<ASTUnit>(buildASTFromCode(
"void bar1(void) {}\nvoid bar2(void) {}", "bar.cc")))),
OS(Str) {}
std::unique_ptr<ASTUnit> FooAST;
std::unique_ptr<ASTUnit> BarAST;
ASTUnit *ASTs[2];
std::unique_ptr<ASTUnit> ASTs[2];
QuerySession S;
std::string Str;

2
clang-tools-extra/unittests/clang-query/QueryParserTest.cpp
View File

@ -18,7 +18,7 @@ using namespace clang::query;
class QueryParserTest : public ::testing::Test {
protected:
QueryParserTest() : QS(llvm::ArrayRef<ASTUnit *>()) {}
QueryParserTest() : QS(llvm::ArrayRef<std::unique_ptr<ASTUnit>>()) {}
QueryRef parse(StringRef Code) { return QueryParser::parse(Code, QS); }
QuerySession QS;