Author: Stanislav Gatev Date: 2022-06-30T07:00:35Z New Revision: 8207c2a660303272ad8ecb1807407f029466ff49
URL: https://github.com/llvm/llvm-project/commit/8207c2a660303272ad8ecb1807407f029466ff49 DIFF: https://github.com/llvm/llvm-project/commit/8207c2a660303272ad8ecb1807407f029466ff49.diff LOG: [clang][dataflow] Handle `for` statements without conditions Handle `for` statements without conditions. Differential Revision: https://reviews.llvm.org/D128833 Reviewed-by: xazax.hun, gribozavr2, li.zhe.hua Added: Modified: clang/lib/Analysis/FlowSensitive/TypeErasedDataflowAnalysis.cpp clang/unittests/Analysis/FlowSensitive/TransferTest.cpp Removed: ################################################################################ diff --git a/clang/lib/Analysis/FlowSensitive/TypeErasedDataflowAnalysis.cpp b/clang/lib/Analysis/FlowSensitive/TypeErasedDataflowAnalysis.cpp index 4a35c39cf2fd5..6443fc1b64226 100644 --- a/clang/lib/Analysis/FlowSensitive/TypeErasedDataflowAnalysis.cpp +++ b/clang/lib/Analysis/FlowSensitive/TypeErasedDataflowAnalysis.cpp @@ -97,8 +97,8 @@ class TerminatorVisitor : public ConstStmtVisitor<TerminatorVisitor> { void VisitForStmt(const ForStmt *S) { auto *Cond = S->getCond(); - assert(Cond != nullptr); - extendFlowCondition(*Cond); + if (Cond != nullptr) + extendFlowCondition(*Cond); } void VisitBinaryOperator(const BinaryOperator *S) { diff --git a/clang/unittests/Analysis/FlowSensitive/TransferTest.cpp b/clang/unittests/Analysis/FlowSensitive/TransferTest.cpp index a0b753ff9e317..021f8a238c634 100644 --- a/clang/unittests/Analysis/FlowSensitive/TransferTest.cpp +++ b/clang/unittests/Analysis/FlowSensitive/TransferTest.cpp @@ -3827,4 +3827,30 @@ TEST_F(TransferTest, ForStmtBranchExtendsFlowCondition) { }); } +TEST_F(TransferTest, ForStmtBranchWithoutConditionDoesNotExtendFlowCondition) { + std::string Code = R"( + void target(bool Foo) { + for (;;) { + (void)0; + // [[loop_body]] + } + } + )"; + runDataflow( + Code, [](llvm::ArrayRef< + std::pair<std::string, DataflowAnalysisState<NoopLattice>>> + Results, + ASTContext &ASTCtx) { + ASSERT_THAT(Results, ElementsAre(Pair("loop_body", _))); + const Environment &LoopBodyEnv = Results[0].second.Env; + + const ValueDecl *FooDecl = findValueDecl(ASTCtx, "Foo"); + ASSERT_THAT(FooDecl, NotNull()); + + BoolValue &LoopBodyFooVal = + *cast<BoolValue>(LoopBodyEnv.getValue(*FooDecl, SkipPast::None)); + EXPECT_FALSE(LoopBodyEnv.flowConditionImplies(LoopBodyFooVal)); + }); +} + } // namespace _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
