Author: alexfh Date: Fri Jul 8 05:50:51 2016 New Revision: 274834 URL: http://llvm.org/viewvc/llvm-project?rev=274834&view=rev Log: CFGBuilder: Fix crash when visiting a range-based for over a dependent type
Summary: CFG generation is expected to fail in this case, but it should not crash. Also added a test that reproduces the crash. Reviewers: klimek Subscribers: cfe-commits Patch by Martin Boehme! Differential Revision: http://reviews.llvm.org/D21895 Added: cfe/trunk/unittests/Analysis/ cfe/trunk/unittests/Analysis/CFGTest.cpp cfe/trunk/unittests/Analysis/CMakeLists.txt Modified: cfe/trunk/lib/Analysis/CFG.cpp cfe/trunk/unittests/CMakeLists.txt Modified: cfe/trunk/lib/Analysis/CFG.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Analysis/CFG.cpp?rev=274834&r1=274833&r2=274834&view=diff ============================================================================== --- cfe/trunk/lib/Analysis/CFG.cpp (original) +++ cfe/trunk/lib/Analysis/CFG.cpp Fri Jul 8 05:50:51 2016 @@ -3457,6 +3457,8 @@ CFGBlock *CFGBuilder::VisitCXXForRangeSt // continue statements. Block = nullptr; Succ = addStmt(S->getInc()); + if (badCFG) + return nullptr; ContinueJumpTarget = JumpTarget(Succ, ContinueScopePos); // The starting block for the loop increment is the block that should Added: cfe/trunk/unittests/Analysis/CFGTest.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Analysis/CFGTest.cpp?rev=274834&view=auto ============================================================================== --- cfe/trunk/unittests/Analysis/CFGTest.cpp (added) +++ cfe/trunk/unittests/Analysis/CFGTest.cpp Fri Jul 8 05:50:51 2016 @@ -0,0 +1,58 @@ +//===- unittests/Analysis/CFGTest.cpp - CFG tests -------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +#include "clang/ASTMatchers/ASTMatchFinder.h" +#include "clang/Analysis/CFG.h" +#include "clang/Tooling/Tooling.h" +#include "gtest/gtest.h" +#include <string> +#include <vector> + +namespace clang { +namespace analysis { +namespace { + +// Constructing a CFG for a range-based for over a dependent type fails (but +// should not crash). +TEST(CFG, RangeBasedForOverDependentType) { + const char *Code = "class Foo;\n" + "template <typename T>\n" + "void f(const T &Range) {\n" + " for (const Foo *TheFoo : Range) {\n" + " }\n" + "}\n"; + + class CFGCallback : public ast_matchers::MatchFinder::MatchCallback { + public: + bool SawFunctionBody = false; + + void run(const ast_matchers::MatchFinder::MatchResult &Result) override { + const auto *Func = Result.Nodes.getNodeAs<FunctionDecl>("func"); + Stmt *Body = Func->getBody(); + if (!Body) + return; + SawFunctionBody = true; + std::unique_ptr<CFG> cfg = + CFG::buildCFG(nullptr, Body, Result.Context, CFG::BuildOptions()); + EXPECT_EQ(nullptr, cfg); + } + } Callback; + + ast_matchers::MatchFinder Finder; + Finder.addMatcher(ast_matchers::functionDecl().bind("func"), &Callback); + std::unique_ptr<tooling::FrontendActionFactory> Factory( + tooling::newFrontendActionFactory(&Finder)); + std::vector<std::string> Args = {"-std=c++11"}; + ASSERT_TRUE(tooling::runToolOnCodeWithArgs(Factory->create(), Code, Args)); + EXPECT_TRUE(Callback.SawFunctionBody); +} + +} // namespace +} // namespace analysis +} // namespace clang Added: cfe/trunk/unittests/Analysis/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Analysis/CMakeLists.txt?rev=274834&view=auto ============================================================================== --- cfe/trunk/unittests/Analysis/CMakeLists.txt (added) +++ cfe/trunk/unittests/Analysis/CMakeLists.txt Fri Jul 8 05:50:51 2016 @@ -0,0 +1,13 @@ +set(LLVM_LINK_COMPONENTS + Support + ) + +add_clang_unittest(CFGTests + CFGTest.cpp + ) + +target_link_libraries(CFGTests + clangAnalysis + clangASTMatchers + clangTooling + ) Modified: cfe/trunk/unittests/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/CMakeLists.txt?rev=274834&r1=274833&r2=274834&view=diff ============================================================================== --- cfe/trunk/unittests/CMakeLists.txt (original) +++ cfe/trunk/unittests/CMakeLists.txt Fri Jul 8 05:50:51 2016 @@ -13,6 +13,7 @@ add_subdirectory(Basic) add_subdirectory(Lex) add_subdirectory(Driver) if(CLANG_ENABLE_STATIC_ANALYZER) + add_subdirectory(Analysis) add_subdirectory(StaticAnalyzer) add_subdirectory(Frontend) endif() _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
