Author: shuaiwang Date: Wed Sep 19 11:00:55 2018 New Revision: 342562 URL: http://llvm.org/viewvc/llvm-project?rev=342562&view=rev Log: [analyzer] Fix nullptr access when processing instantiated function in ExprMutationAnalyzer.
Modified: cfe/trunk/lib/Analysis/ExprMutationAnalyzer.cpp cfe/trunk/unittests/Analysis/ExprMutationAnalyzerTest.cpp Modified: cfe/trunk/lib/Analysis/ExprMutationAnalyzer.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Analysis/ExprMutationAnalyzer.cpp?rev=342562&r1=342561&r2=342562&view=diff ============================================================================== --- cfe/trunk/lib/Analysis/ExprMutationAnalyzer.cpp (original) +++ cfe/trunk/lib/Analysis/ExprMutationAnalyzer.cpp Wed Sep 19 11:00:55 2018 @@ -379,7 +379,7 @@ const Stmt *ExprMutationAnalyzer::findFu for (const auto &Nodes : Matches) { const auto *Exp = Nodes.getNodeAs<Expr>(NodeID<Expr>::value); const auto *Func = Nodes.getNodeAs<FunctionDecl>("func"); - if (!Func->getBody()) + if (!Func->getBody() || !Func->getPrimaryTemplate()) return Exp; const auto *Parm = Nodes.getNodeAs<ParmVarDecl>("parm"); Modified: cfe/trunk/unittests/Analysis/ExprMutationAnalyzerTest.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Analysis/ExprMutationAnalyzerTest.cpp?rev=342562&r1=342561&r2=342562&view=diff ============================================================================== --- cfe/trunk/unittests/Analysis/ExprMutationAnalyzerTest.cpp (original) +++ cfe/trunk/unittests/Analysis/ExprMutationAnalyzerTest.cpp Wed Sep 19 11:00:55 2018 @@ -215,6 +215,12 @@ TEST(ExprMutationAnalyzerTest, ByValueAr "void f() { A x, y; y = x; }"); Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext()); EXPECT_FALSE(isMutated(Results, AST.get())); + + AST = buildASTFromCode( + "template <int> struct A { A(); A(const A&); static void mf(A) {} };" + "void f() { A<0> x; A<0>::mf(x); }"); + Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext()); + EXPECT_FALSE(isMutated(Results, AST.get())); } TEST(ExprMutationAnalyzerTest, ByConstValueArgument) { @@ -241,6 +247,12 @@ TEST(ExprMutationAnalyzerTest, ByConstVa "void f() { struct A { A(const int); }; int x; A y(x); }"); Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext()); EXPECT_FALSE(isMutated(Results, AST.get())); + + AST = buildASTFromCode("template <int> struct A { A(); A(const A&);" + "static void mf(const A&) {} };" + "void f() { A<0> x; A<0>::mf(x); }"); + Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext()); + EXPECT_FALSE(isMutated(Results, AST.get())); } TEST(ExprMutationAnalyzerTest, ByNonConstRefArgument) { @@ -288,6 +300,12 @@ TEST(ExprMutationAnalyzerTest, ByNonCons AST = buildASTFromCode("void f() { struct A { A(); A(A&); }; A x; A y(x); }"); Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext()); EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("x")); + + AST = buildASTFromCode( + "template <int> struct A { A(); A(const A&); static void mf(A&) {} };" + "void f() { A<0> x; A<0>::mf(x); }"); + Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext()); + EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("A<0>::mf(x)")); } TEST(ExprMutationAnalyzerTest, ByConstRefArgument) { @@ -686,6 +704,12 @@ TEST(ExprMutationAnalyzerTest, FollowFun Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext()); EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("x")); + AST = buildASTFromCode("template <class U> struct S {" + "template <class T> S(T&& t) : m(++t) { } U m; };" + "void f() { int x; S<int> s(x); }"); + Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext()); + EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("x")); + AST = buildASTFromCode(StdRemoveReference + StdForward + "template <class... Args> void u(Args&...);" "template <class... Args> void h(Args&&... args)" @@ -737,6 +761,12 @@ TEST(ExprMutationAnalyzerTest, FollowFun Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext()); EXPECT_FALSE(isMutated(Results, AST.get())); + AST = buildASTFromCode("template <class U> struct S {" + "template <class T> S(T&& t) : m(t) { } U m; };" + "void f() { int x; S<int> s(x); }"); + Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext()); + EXPECT_FALSE(isMutated(Results, AST.get())); + AST = buildASTFromCode(StdRemoveReference + StdForward + "template <class... Args> void u(Args...);" "template <class... Args> void h(Args&&... args)" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits