Author: Stanislav Gatev Date: 2022-06-20T05:48:45Z New Revision: 83232099cb5e7edd9a9bf1c5c8834282a58110e5
URL: https://github.com/llvm/llvm-project/commit/83232099cb5e7edd9a9bf1c5c8834282a58110e5 DIFF: https://github.com/llvm/llvm-project/commit/83232099cb5e7edd9a9bf1c5c8834282a58110e5.diff LOG: [clang][dataflow] Extend flow condition in the body of a for loop Extend flow condition in the body of a for loop. Differential Revision: https://reviews.llvm.org/D128060 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 8a5d5ca386afe..a1ce2f6912574 100644 --- a/clang/lib/Analysis/FlowSensitive/TypeErasedDataflowAnalysis.cpp +++ b/clang/lib/Analysis/FlowSensitive/TypeErasedDataflowAnalysis.cpp @@ -89,6 +89,12 @@ class TerminatorVisitor : public ConstStmtVisitor<TerminatorVisitor> { extendFlowCondition(*Cond); } + void VisitForStmt(const ForStmt *S) { + auto *Cond = S->getCond(); + assert(Cond != nullptr); + extendFlowCondition(*Cond); + } + void VisitBinaryOperator(const BinaryOperator *S) { assert(S->getOpcode() == BO_LAnd || S->getOpcode() == BO_LOr); auto *LHS = S->getLHS(); diff --git a/clang/unittests/Analysis/FlowSensitive/TransferTest.cpp b/clang/unittests/Analysis/FlowSensitive/TransferTest.cpp index ab51bf2196b79..29a45a315074d 100644 --- a/clang/unittests/Analysis/FlowSensitive/TransferTest.cpp +++ b/clang/unittests/Analysis/FlowSensitive/TransferTest.cpp @@ -3588,4 +3588,91 @@ TEST_F(TransferTest, BinaryOperatorComma) { }); } +TEST_F(TransferTest, IfStmtBranchExtendsFlowCondition) { + std::string Code = R"( + void target(bool Foo) { + if (Foo) { + (void)0; + // [[if_then]] + } else { + (void)0; + // [[if_else]] + } + } + )"; + runDataflow( + Code, [](llvm::ArrayRef< + std::pair<std::string, DataflowAnalysisState<NoopLattice>>> + Results, + ASTContext &ASTCtx) { + ASSERT_THAT(Results, + ElementsAre(Pair("if_else", _), Pair("if_then", _))); + const Environment &ThenEnv = Results[1].second.Env; + const Environment &ElseEnv = Results[0].second.Env; + + const ValueDecl *FooDecl = findValueDecl(ASTCtx, "Foo"); + ASSERT_THAT(FooDecl, NotNull()); + + BoolValue &ThenFooVal = + *cast<BoolValue>(ThenEnv.getValue(*FooDecl, SkipPast::None)); + EXPECT_TRUE(ThenEnv.flowConditionImplies(ThenFooVal)); + + BoolValue &ElseFooVal = + *cast<BoolValue>(ElseEnv.getValue(*FooDecl, SkipPast::None)); + EXPECT_TRUE(ElseEnv.flowConditionImplies(ElseEnv.makeNot(ElseFooVal))); + }); +} + +TEST_F(TransferTest, WhileStmtBranchExtendsFlowCondition) { + std::string Code = R"( + void target(bool Foo) { + while (Foo) { + (void)0; + // [[while_branch]] + } + } + )"; + runDataflow(Code, + [](llvm::ArrayRef< + std::pair<std::string, DataflowAnalysisState<NoopLattice>>> + Results, + ASTContext &ASTCtx) { + ASSERT_THAT(Results, ElementsAre(Pair("while_branch", _))); + const Environment &Env = Results[0].second.Env; + + const ValueDecl *FooDecl = findValueDecl(ASTCtx, "Foo"); + ASSERT_THAT(FooDecl, NotNull()); + + BoolValue &FooVal = + *cast<BoolValue>(Env.getValue(*FooDecl, SkipPast::None)); + EXPECT_TRUE(Env.flowConditionImplies(FooVal)); + }); +} + +TEST_F(TransferTest, ForStmtBranchExtendsFlowCondition) { + std::string Code = R"( + void target(bool Foo) { + for (; Foo;) { + (void)0; + // [[for_branch]] + } + } + )"; + runDataflow(Code, + [](llvm::ArrayRef< + std::pair<std::string, DataflowAnalysisState<NoopLattice>>> + Results, + ASTContext &ASTCtx) { + ASSERT_THAT(Results, ElementsAre(Pair("for_branch", _))); + const Environment &Env = Results[0].second.Env; + + const ValueDecl *FooDecl = findValueDecl(ASTCtx, "Foo"); + ASSERT_THAT(FooDecl, NotNull()); + + BoolValue &FooVal = + *cast<BoolValue>(Env.getValue(*FooDecl, SkipPast::None)); + EXPECT_TRUE(Env.flowConditionImplies(FooVal)); + }); +} + } // namespace _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
