This revision was landed with ongoing or failed builds. This revision was automatically updated to reflect the committed changes. Closed by commit rG37458c66bfef: [clang][dataflow] Eliminate deprecated `DataflowAnalysis` constructor. (authored by mboehme).
Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D159261/new/ https://reviews.llvm.org/D159261 Files: clang/include/clang/Analysis/FlowSensitive/DataflowAnalysis.h clang/include/clang/Analysis/FlowSensitive/NoopAnalysis.h clang/unittests/Analysis/FlowSensitive/ChromiumCheckModelTest.cpp clang/unittests/Analysis/FlowSensitive/TestingSupportTest.cpp clang/unittests/Analysis/FlowSensitive/TransferTest.cpp clang/unittests/Analysis/FlowSensitive/TypeErasedDataflowAnalysisTest.cpp
Index: clang/unittests/Analysis/FlowSensitive/TypeErasedDataflowAnalysisTest.cpp =================================================================== --- clang/unittests/Analysis/FlowSensitive/TypeErasedDataflowAnalysisTest.cpp +++ clang/unittests/Analysis/FlowSensitive/TypeErasedDataflowAnalysisTest.cpp @@ -78,7 +78,9 @@ TEST(DataflowAnalysisTest, NoopAnalysis) { auto BlockStates = llvm::cantFail( runAnalysis<NoopAnalysis>("void target() {}", [](ASTContext &C) { - return NoopAnalysis(C, false); + return NoopAnalysis(C, + // Don't use builtin transfer function. + DataflowAnalysisOptions{std::nullopt}); })); EXPECT_EQ(BlockStates.size(), 2u); EXPECT_TRUE(BlockStates[0].has_value()); @@ -130,7 +132,8 @@ explicit NonConvergingAnalysis(ASTContext &Context) : DataflowAnalysis<NonConvergingAnalysis, NonConvergingLattice>( Context, - /*ApplyBuiltinTransfer=*/false) {} + // Don't apply builtin transfer function. + DataflowAnalysisOptions{std::nullopt}) {} static NonConvergingLattice initialElement() { return {0}; } @@ -811,7 +814,7 @@ AnalysisInputs<NoopAnalysis>( Code, ast_matchers::hasName("target"), [](ASTContext &Context, Environment &Env) { - return NoopAnalysis(Context, true); + return NoopAnalysis(Context); }) .withASTBuildArgs({"-fsyntax-only", "-std=c++17"}), /*VerifyResults=*/[&Match](const llvm::StringMap< Index: clang/unittests/Analysis/FlowSensitive/TransferTest.cpp =================================================================== --- clang/unittests/Analysis/FlowSensitive/TransferTest.cpp +++ clang/unittests/Analysis/FlowSensitive/TransferTest.cpp @@ -1418,9 +1418,7 @@ checkDataflow<NoopAnalysis>( AnalysisInputs<NoopAnalysis>( Code, cxxConstructorDecl(ofClass(hasName("B"))), - [](ASTContext &C, Environment &) { - return NoopAnalysis(C, /*ApplyBuiltinTransfer=*/true); - }) + [](ASTContext &C, Environment &) { return NoopAnalysis(C); }) .withASTBuildArgs( {"-fsyntax-only", "-fno-delayed-template-parsing", "-std=" + std::string(LangStandard::getLangStandardForKind( Index: clang/unittests/Analysis/FlowSensitive/TestingSupportTest.cpp =================================================================== --- clang/unittests/Analysis/FlowSensitive/TestingSupportTest.cpp +++ clang/unittests/Analysis/FlowSensitive/TestingSupportTest.cpp @@ -86,7 +86,9 @@ Code, std::move(TargetFuncMatcher), [](ASTContext &Context, Environment &) { return NoopAnalysis( - Context, /*ApplyBuiltinTransfer=*/false); + Context, + // Don't apply builtin transfer function. + DataflowAnalysisOptions{std::nullopt}); }) .withASTBuildArgs({"-fsyntax-only", "-std=c++17"}), /*VerifyResults=*/std::move(Expectations)), Index: clang/unittests/Analysis/FlowSensitive/ChromiumCheckModelTest.cpp =================================================================== --- clang/unittests/Analysis/FlowSensitive/ChromiumCheckModelTest.cpp +++ clang/unittests/Analysis/FlowSensitive/ChromiumCheckModelTest.cpp @@ -113,8 +113,7 @@ : public DataflowAnalysis<ModelAdaptorAnalysis<Model>, NoopLattice> { public: explicit ModelAdaptorAnalysis(ASTContext &Context) - : DataflowAnalysis<ModelAdaptorAnalysis, NoopLattice>( - Context, /*ApplyBuiltinTransfer=*/true) {} + : DataflowAnalysis<ModelAdaptorAnalysis, NoopLattice>(Context) {} static NoopLattice initialElement() { return NoopLattice(); } Index: clang/include/clang/Analysis/FlowSensitive/NoopAnalysis.h =================================================================== --- clang/include/clang/Analysis/FlowSensitive/NoopAnalysis.h +++ clang/include/clang/Analysis/FlowSensitive/NoopAnalysis.h @@ -27,15 +27,6 @@ NoopAnalysis(ASTContext &Context) : DataflowAnalysis<NoopAnalysis, NoopLattice>(Context) {} - /// Deprecated. Use the `DataflowAnalysisOptions` constructor instead. - NoopAnalysis(ASTContext &Context, bool ApplyBuiltinTransfer) - : DataflowAnalysis<NoopAnalysis, NoopLattice>(Context, - ApplyBuiltinTransfer) {} - - /// `ApplyBuiltinTransfer` controls whether to run the built-in transfer - /// functions that model memory during the analysis. Their results are not - /// used by `NoopAnalysis`, but tests that need to inspect the environment - /// should enable them. NoopAnalysis(ASTContext &Context, DataflowAnalysisOptions Options) : DataflowAnalysis<NoopAnalysis, NoopLattice>(Context, Options) {} Index: clang/include/clang/Analysis/FlowSensitive/DataflowAnalysis.h =================================================================== --- clang/include/clang/Analysis/FlowSensitive/DataflowAnalysis.h +++ clang/include/clang/Analysis/FlowSensitive/DataflowAnalysis.h @@ -85,14 +85,6 @@ explicit DataflowAnalysis(ASTContext &Context) : Context(Context) {} - /// Deprecated. Use the `DataflowAnalysisOptions` constructor instead. - explicit DataflowAnalysis(ASTContext &Context, bool ApplyBuiltinTransfer) - : DataflowAnalysis( - Context, - {ApplyBuiltinTransfer - ? DataflowAnalysisContext::Options{} - : std::optional<DataflowAnalysisContext::Options>()}) {} - explicit DataflowAnalysis(ASTContext &Context, DataflowAnalysisOptions Options) : TypeErasedDataflowAnalysis(Options), Context(Context) {}
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits