sgatev updated this revision to Diff 414094. sgatev added a comment. Move NoopAnalysis.h to clang/include/clang/Analysis/FlowSensitive/Testing.
Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D121285/new/ https://reviews.llvm.org/D121285 Files: clang/include/clang/Analysis/FlowSensitive/Testing/DataflowAnalysis.h clang/include/clang/Analysis/FlowSensitive/Testing/NoopAnalysis.h clang/lib/Analysis/FlowSensitive/CMakeLists.txt clang/lib/Analysis/FlowSensitive/Testing/CMakeLists.txt clang/lib/Analysis/FlowSensitive/Testing/DataflowAnalysis.cpp clang/unittests/Analysis/FlowSensitive/CMakeLists.txt clang/unittests/Analysis/FlowSensitive/DataflowEnvironmentTest.cpp clang/unittests/Analysis/FlowSensitive/MatchSwitchTest.cpp clang/unittests/Analysis/FlowSensitive/MultiVarConstantPropagationTest.cpp clang/unittests/Analysis/FlowSensitive/NoopAnalysis.h clang/unittests/Analysis/FlowSensitive/SingleVarConstantPropagationTest.cpp clang/unittests/Analysis/FlowSensitive/Testing/CMakeLists.txt clang/unittests/Analysis/FlowSensitive/Testing/DataflowCheckerTest.cpp clang/unittests/Analysis/FlowSensitive/TestingSupport.cpp clang/unittests/Analysis/FlowSensitive/TestingSupport.h 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 @@ -6,8 +6,6 @@ // //===----------------------------------------------------------------------===// -#include "NoopAnalysis.h" -#include "TestingSupport.h" #include "clang/AST/Decl.h" #include "clang/AST/ExprCXX.h" #include "clang/ASTMatchers/ASTMatchFinder.h" @@ -17,6 +15,8 @@ #include "clang/Analysis/FlowSensitive/DataflowAnalysisContext.h" #include "clang/Analysis/FlowSensitive/DataflowEnvironment.h" #include "clang/Analysis/FlowSensitive/DataflowLattice.h" +#include "clang/Analysis/FlowSensitive/Testing/DataflowAnalysis.h" +#include "clang/Analysis/FlowSensitive/Testing/NoopAnalysis.h" #include "clang/Analysis/FlowSensitive/Value.h" #include "clang/Analysis/FlowSensitive/WatchedLiteralsSolver.h" #include "clang/Tooling/Tooling.h" Index: clang/unittests/Analysis/FlowSensitive/TransferTest.cpp =================================================================== --- clang/unittests/Analysis/FlowSensitive/TransferTest.cpp +++ clang/unittests/Analysis/FlowSensitive/TransferTest.cpp @@ -6,14 +6,14 @@ // //===----------------------------------------------------------------------===// -#include "NoopAnalysis.h" -#include "TestingSupport.h" #include "clang/AST/ASTContext.h" #include "clang/AST/Decl.h" #include "clang/ASTMatchers/ASTMatchFinder.h" #include "clang/ASTMatchers/ASTMatchers.h" #include "clang/Analysis/FlowSensitive/DataflowEnvironment.h" #include "clang/Analysis/FlowSensitive/StorageLocation.h" +#include "clang/Analysis/FlowSensitive/Testing/DataflowAnalysis.h" +#include "clang/Analysis/FlowSensitive/Testing/NoopAnalysis.h" #include "clang/Analysis/FlowSensitive/Value.h" #include "clang/Basic/LangStandard.h" #include "llvm/ADT/ArrayRef.h" Index: clang/unittests/Analysis/FlowSensitive/Testing/DataflowCheckerTest.cpp =================================================================== --- clang/unittests/Analysis/FlowSensitive/Testing/DataflowCheckerTest.cpp +++ clang/unittests/Analysis/FlowSensitive/Testing/DataflowCheckerTest.cpp @@ -1,8 +1,16 @@ -#include "TestingSupport.h" -#include "NoopAnalysis.h" +//===- DataflowAnalysisTest.cpp -------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + #include "clang/AST/ASTContext.h" #include "clang/ASTMatchers/ASTMatchFinder.h" #include "clang/ASTMatchers/ASTMatchers.h" +#include "clang/Analysis/FlowSensitive/Testing/DataflowAnalysis.h" +#include "clang/Analysis/FlowSensitive/Testing/NoopAnalysis.h" #include "clang/Tooling/Tooling.h" #include "llvm/Testing/Support/Error.h" #include "gmock/gmock.h" Index: clang/unittests/Analysis/FlowSensitive/Testing/CMakeLists.txt =================================================================== --- /dev/null +++ clang/unittests/Analysis/FlowSensitive/Testing/CMakeLists.txt @@ -0,0 +1,28 @@ +set(LLVM_LINK_COMPONENTS + FrontendOpenMP + Support + ) + +add_clang_unittest(ClangAnalysisFlowSensitiveTestingTests + DataflowCheckerTest.cpp + ) + +clang_target_link_libraries(ClangAnalysisFlowSensitiveTestingTests + PRIVATE + clangAnalysis + clangAnalysisFlowSensitive + clangAnalysisFlowSensitiveTesting + clangAST + clangASTMatchers + clangBasic + clangFrontend + clangLex + clangSerialization + clangTesting + clangTooling + ) + +target_link_libraries(ClangAnalysisFlowSensitiveTestingTests + PRIVATE + LLVMTestingSupport + ) Index: clang/unittests/Analysis/FlowSensitive/SingleVarConstantPropagationTest.cpp =================================================================== --- clang/unittests/Analysis/FlowSensitive/SingleVarConstantPropagationTest.cpp +++ clang/unittests/Analysis/FlowSensitive/SingleVarConstantPropagationTest.cpp @@ -12,7 +12,6 @@ // //===----------------------------------------------------------------------===// -#include "TestingSupport.h" #include "clang/AST/ASTContext.h" #include "clang/AST/Decl.h" #include "clang/AST/Expr.h" @@ -22,6 +21,7 @@ #include "clang/Analysis/FlowSensitive/DataflowAnalysis.h" #include "clang/Analysis/FlowSensitive/DataflowEnvironment.h" #include "clang/Analysis/FlowSensitive/DataflowLattice.h" +#include "clang/Analysis/FlowSensitive/Testing/DataflowAnalysis.h" #include "clang/Tooling/Tooling.h" #include "llvm/ADT/None.h" #include "llvm/ADT/Optional.h" Index: clang/unittests/Analysis/FlowSensitive/MultiVarConstantPropagationTest.cpp =================================================================== --- clang/unittests/Analysis/FlowSensitive/MultiVarConstantPropagationTest.cpp +++ clang/unittests/Analysis/FlowSensitive/MultiVarConstantPropagationTest.cpp @@ -12,7 +12,6 @@ // //===----------------------------------------------------------------------===// -#include "TestingSupport.h" #include "clang/AST/ASTContext.h" #include "clang/AST/Decl.h" #include "clang/AST/Expr.h" @@ -23,6 +22,7 @@ #include "clang/Analysis/FlowSensitive/DataflowEnvironment.h" #include "clang/Analysis/FlowSensitive/DataflowLattice.h" #include "clang/Analysis/FlowSensitive/MapLattice.h" +#include "clang/Analysis/FlowSensitive/Testing/DataflowAnalysis.h" #include "clang/Tooling/Tooling.h" #include "llvm/ADT/None.h" #include "llvm/ADT/Optional.h" Index: clang/unittests/Analysis/FlowSensitive/MatchSwitchTest.cpp =================================================================== --- clang/unittests/Analysis/FlowSensitive/MatchSwitchTest.cpp +++ clang/unittests/Analysis/FlowSensitive/MatchSwitchTest.cpp @@ -13,7 +13,6 @@ //===----------------------------------------------------------------------===// #include "clang/Analysis/FlowSensitive/MatchSwitch.h" -#include "TestingSupport.h" #include "clang/AST/ASTContext.h" #include "clang/AST/Decl.h" #include "clang/AST/Expr.h" @@ -24,6 +23,7 @@ #include "clang/Analysis/FlowSensitive/DataflowEnvironment.h" #include "clang/Analysis/FlowSensitive/DataflowLattice.h" #include "clang/Analysis/FlowSensitive/MapLattice.h" +#include "clang/Analysis/FlowSensitive/Testing/DataflowAnalysis.h" #include "clang/Tooling/Tooling.h" #include "llvm/ADT/None.h" #include "llvm/ADT/Optional.h" Index: clang/unittests/Analysis/FlowSensitive/DataflowEnvironmentTest.cpp =================================================================== --- clang/unittests/Analysis/FlowSensitive/DataflowEnvironmentTest.cpp +++ clang/unittests/Analysis/FlowSensitive/DataflowEnvironmentTest.cpp @@ -7,9 +7,9 @@ //===----------------------------------------------------------------------===// #include "clang/Analysis/FlowSensitive/DataflowEnvironment.h" -#include "NoopAnalysis.h" -#include "TestingSupport.h" #include "clang/Analysis/FlowSensitive/DataflowAnalysisContext.h" +#include "clang/Analysis/FlowSensitive/Testing/DataflowAnalysis.h" +#include "clang/Analysis/FlowSensitive/Testing/NoopAnalysis.h" #include "clang/Analysis/FlowSensitive/Value.h" #include "clang/Analysis/FlowSensitive/WatchedLiteralsSolver.h" #include "gmock/gmock.h" Index: clang/unittests/Analysis/FlowSensitive/CMakeLists.txt =================================================================== --- clang/unittests/Analysis/FlowSensitive/CMakeLists.txt +++ clang/unittests/Analysis/FlowSensitive/CMakeLists.txt @@ -11,8 +11,6 @@ MultiVarConstantPropagationTest.cpp SingleVarConstantPropagationTest.cpp SourceLocationsLatticeTest.cpp - TestingSupport.cpp - TestingSupportTest.cpp TransferTest.cpp TypeErasedDataflowAnalysisTest.cpp SolverTest.cpp @@ -22,6 +20,7 @@ PRIVATE clangAnalysis clangAnalysisFlowSensitive + clangAnalysisFlowSensitiveTesting clangAST clangASTMatchers clangBasic @@ -36,3 +35,5 @@ PRIVATE LLVMTestingSupport ) + +add_subdirectory(Testing) Index: clang/lib/Analysis/FlowSensitive/Testing/DataflowAnalysis.cpp =================================================================== --- clang/lib/Analysis/FlowSensitive/Testing/DataflowAnalysis.cpp +++ clang/lib/Analysis/FlowSensitive/Testing/DataflowAnalysis.cpp @@ -1,4 +1,16 @@ -#include "TestingSupport.h" +//===-- DataflowAnalysis.cpp ------------------------------------*- C++ -*-===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// +// +// This file defines utilities to simplify testing of dataflow analyses. +// +//===----------------------------------------------------------------------===// + +#include "clang/Analysis/FlowSensitive/Testing/DataflowAnalysis.h" #include "clang/AST/ASTContext.h" #include "clang/AST/Decl.h" #include "clang/AST/Stmt.h" Index: clang/lib/Analysis/FlowSensitive/Testing/CMakeLists.txt =================================================================== --- /dev/null +++ clang/lib/Analysis/FlowSensitive/Testing/CMakeLists.txt @@ -0,0 +1,14 @@ +add_clang_library(clangAnalysisFlowSensitiveTesting + DataflowAnalysis.cpp + + LINK_LIBS + clangAnalysis + clangAnalysisFlowSensitive + clangAST + clangBasic + clangFrontend + clangLex + clangSerialization + clangTesting + clangTooling + ) Index: clang/lib/Analysis/FlowSensitive/CMakeLists.txt =================================================================== --- clang/lib/Analysis/FlowSensitive/CMakeLists.txt +++ clang/lib/Analysis/FlowSensitive/CMakeLists.txt @@ -12,3 +12,5 @@ clangAST clangBasic ) + +add_subdirectory(Testing) Index: clang/include/clang/Analysis/FlowSensitive/Testing/NoopAnalysis.h =================================================================== --- clang/include/clang/Analysis/FlowSensitive/Testing/NoopAnalysis.h +++ clang/include/clang/Analysis/FlowSensitive/Testing/NoopAnalysis.h @@ -11,8 +11,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_UNITTESTS_ANALYSIS_FLOWSENSITIVE_NOOPANALYSIS_H -#define LLVM_CLANG_UNITTESTS_ANALYSIS_FLOWSENSITIVE_NOOPANALYSIS_H +#ifndef LLVM_CLANG_ANALYSIS_FLOWSENSITIVE_TESTING_NOOPANALYSIS_H +#define LLVM_CLANG_ANALYSIS_FLOWSENSITIVE_TESTING_NOOPANALYSIS_H #include "clang/AST/ASTContext.h" #include "clang/AST/Stmt.h" @@ -55,4 +55,4 @@ } // namespace dataflow } // namespace clang -#endif // LLVM_CLANG_UNITTESTS_ANALYSIS_FLOWSENSITIVE_NOOPANALYSIS_H +#endif // LLVM_CLANG_ANALYSIS_FLOWSENSITIVE_TESTING_NOOPANALYSIS_H Index: clang/include/clang/Analysis/FlowSensitive/Testing/DataflowAnalysis.h =================================================================== --- clang/include/clang/Analysis/FlowSensitive/Testing/DataflowAnalysis.h +++ clang/include/clang/Analysis/FlowSensitive/Testing/DataflowAnalysis.h @@ -1,4 +1,4 @@ -//===--- TestingSupport.h - Testing utils for dataflow analyses -*- C++ -*-===// +//===--- DataflowAnalysis.h - Testing utils for dataflow analyses * C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_ANALYSIS_FLOW_SENSITIVE_TESTING_SUPPORT_H_ -#define LLVM_CLANG_ANALYSIS_FLOW_SENSITIVE_TESTING_SUPPORT_H_ +#ifndef LLVM_CLANG_ANALYSIS_FLOWSENSITIVE_TESTING_DATAFLOWANALYSIS_H +#define LLVM_CLANG_ANALYSIS_FLOWSENSITIVE_TESTING_DATAFLOWANALYSIS_H #include "clang/AST/ASTContext.h" #include "clang/AST/Decl.h" @@ -179,4 +179,4 @@ } // namespace dataflow } // namespace clang -#endif // LLVM_CLANG_ANALYSIS_FLOW_SENSITIVE_TESTING_SUPPORT_H_ +#endif // LLVM_CLANG_ANALYSIS_FLOWSENSITIVE_TESTING_DATAFLOWANALYSIS_H
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
