Skip to content

Commit 3dd7877

Browse files
sgatevsgatev
committed
Revert "[clang][dataflow] Move dataflow testing support out of unittests"
This reverts commit 26bbde2.
1 parent 26bbde2 commit 3dd7877

14 files changed

+21
-86
lines changed

‎clang/lib/Analysis/FlowSensitive/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,3 @@ add_clang_library(clangAnalysisFlowSensitive
1212
clangAST
1313
clangBasic
1414
)
15-
16-
add_subdirectory(Testing)

‎clang/lib/Analysis/FlowSensitive/Testing/CMakeLists.txt

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎clang/unittests/Analysis/FlowSensitive/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ add_clang_unittest(ClangAnalysisFlowSensitiveTests
1111
MultiVarConstantPropagationTest.cpp
1212
SingleVarConstantPropagationTest.cpp
1313
SourceLocationsLatticeTest.cpp
14+
TestingSupport.cpp
15+
TestingSupportTest.cpp
1416
TransferTest.cpp
1517
TypeErasedDataflowAnalysisTest.cpp
1618
SolverTest.cpp
@@ -20,7 +22,6 @@ clang_target_link_libraries(ClangAnalysisFlowSensitiveTests
2022
PRIVATE
2123
clangAnalysis
2224
clangAnalysisFlowSensitive
23-
clangAnalysisFlowSensitiveTesting
2425
clangAST
2526
clangASTMatchers
2627
clangBasic
@@ -35,5 +36,3 @@ target_link_libraries(ClangAnalysisFlowSensitiveTests
3536
PRIVATE
3637
LLVMTestingSupport
3738
)
38-
39-
add_subdirectory(Testing)

‎clang/unittests/Analysis/FlowSensitive/DataflowEnvironmentTest.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "clang/Analysis/FlowSensitive/DataflowEnvironment.h"
10+
#include "NoopAnalysis.h"
11+
#include "TestingSupport.h"
1012
#include "clang/Analysis/FlowSensitive/DataflowAnalysisContext.h"
11-
#include "clang/Analysis/FlowSensitive/Testing/DataflowAnalysis.h"
12-
#include "clang/Analysis/FlowSensitive/Testing/NoopAnalysis.h"
1313
#include "clang/Analysis/FlowSensitive/Value.h"
1414
#include "clang/Analysis/FlowSensitive/WatchedLiteralsSolver.h"
1515
#include "gmock/gmock.h"

‎clang/unittests/Analysis/FlowSensitive/MatchSwitchTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
//===----------------------------------------------------------------------===//
1414

1515
#include "clang/Analysis/FlowSensitive/MatchSwitch.h"
16+
#include "TestingSupport.h"
1617
#include "clang/AST/ASTContext.h"
1718
#include "clang/AST/Decl.h"
1819
#include "clang/AST/Expr.h"
@@ -23,7 +24,6 @@
2324
#include "clang/Analysis/FlowSensitive/DataflowEnvironment.h"
2425
#include "clang/Analysis/FlowSensitive/DataflowLattice.h"
2526
#include "clang/Analysis/FlowSensitive/MapLattice.h"
26-
#include "clang/Analysis/FlowSensitive/Testing/DataflowAnalysis.h"
2727
#include "clang/Tooling/Tooling.h"
2828
#include "llvm/ADT/None.h"
2929
#include "llvm/ADT/Optional.h"

‎clang/unittests/Analysis/FlowSensitive/MultiVarConstantPropagationTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
//
1313
//===----------------------------------------------------------------------===//
1414

15+
#include "TestingSupport.h"
1516
#include "clang/AST/ASTContext.h"
1617
#include "clang/AST/Decl.h"
1718
#include "clang/AST/Expr.h"
@@ -22,7 +23,6 @@
2223
#include "clang/Analysis/FlowSensitive/DataflowEnvironment.h"
2324
#include "clang/Analysis/FlowSensitive/DataflowLattice.h"
2425
#include "clang/Analysis/FlowSensitive/MapLattice.h"
25-
#include "clang/Analysis/FlowSensitive/Testing/DataflowAnalysis.h"
2626
#include "clang/Tooling/Tooling.h"
2727
#include "llvm/ADT/None.h"
2828
#include "llvm/ADT/Optional.h"

‎clang/include/clang/Analysis/FlowSensitive/Testing/NoopAnalysis.h renamed to ‎clang/unittests/Analysis/FlowSensitive/NoopAnalysis.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
//
1212
//===----------------------------------------------------------------------===//
1313

14-
#ifndef LLVM_CLANG_ANALYSIS_FLOWSENSITIVE_TESTING_NOOPANALYSIS_H
15-
#define LLVM_CLANG_ANALYSIS_FLOWSENSITIVE_TESTING_NOOPANALYSIS_H
14+
#ifndef LLVM_CLANG_UNITTESTS_ANALYSIS_FLOWSENSITIVE_NOOPANALYSIS_H
15+
#define LLVM_CLANG_UNITTESTS_ANALYSIS_FLOWSENSITIVE_NOOPANALYSIS_H
1616

1717
#include "clang/AST/ASTContext.h"
1818
#include "clang/AST/Stmt.h"
@@ -55,4 +55,4 @@ class NoopAnalysis : public DataflowAnalysis<NoopAnalysis, NoopLattice> {
5555
} // namespace dataflow
5656
} // namespace clang
5757

58-
#endif // LLVM_CLANG_ANALYSIS_FLOWSENSITIVE_TESTING_NOOPANALYSIS_H
58+
#endif // LLVM_CLANG_UNITTESTS_ANALYSIS_FLOWSENSITIVE_NOOPANALYSIS_H

‎clang/unittests/Analysis/FlowSensitive/SingleVarConstantPropagationTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
//
1313
//===----------------------------------------------------------------------===//
1414

15+
#include "TestingSupport.h"
1516
#include "clang/AST/ASTContext.h"
1617
#include "clang/AST/Decl.h"
1718
#include "clang/AST/Expr.h"
@@ -21,7 +22,6 @@
2122
#include "clang/Analysis/FlowSensitive/DataflowAnalysis.h"
2223
#include "clang/Analysis/FlowSensitive/DataflowEnvironment.h"
2324
#include "clang/Analysis/FlowSensitive/DataflowLattice.h"
24-
#include "clang/Analysis/FlowSensitive/Testing/DataflowAnalysis.h"
2525
#include "clang/Tooling/Tooling.h"
2626
#include "llvm/ADT/None.h"
2727
#include "llvm/ADT/Optional.h"

‎clang/unittests/Analysis/FlowSensitive/Testing/CMakeLists.txt

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎clang/lib/Analysis/FlowSensitive/Testing/DataflowAnalysis.cpp renamed to ‎clang/unittests/Analysis/FlowSensitive/TestingSupport.cpp

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,4 @@
1-
//===-- DataflowAnalysis.cpp ------------------------------------*- C++ -*-===//
2-
//
3-
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4-
// See https://llvm.org/LICENSE.txt for license information.
5-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6-
//
7-
//===----------------------------------------------------------------------===//
8-
//
9-
// This file defines utilities to simplify testing of dataflow analyses.
10-
//
11-
//===----------------------------------------------------------------------===//
12-
13-
#include "clang/Analysis/FlowSensitive/Testing/DataflowAnalysis.h"
1+
#include "TestingSupport.h"
142
#include "clang/AST/ASTContext.h"
153
#include "clang/AST/Decl.h"
164
#include "clang/AST/Stmt.h"

‎clang/include/clang/Analysis/FlowSensitive/Testing/DataflowAnalysis.h renamed to ‎clang/unittests/Analysis/FlowSensitive/TestingSupport.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===--- DataflowAnalysis.h - Testing utils for dataflow analyses * C++ -*-===//
1+
//===--- TestingSupport.h - Testing utils for dataflow analyses -*- C++ -*-===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.
@@ -10,8 +10,8 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
#ifndef LLVM_CLANG_ANALYSIS_FLOWSENSITIVE_TESTING_DATAFLOWANALYSIS_H
14-
#define LLVM_CLANG_ANALYSIS_FLOWSENSITIVE_TESTING_DATAFLOWANALYSIS_H
13+
#ifndef LLVM_CLANG_ANALYSIS_FLOW_SENSITIVE_TESTING_SUPPORT_H_
14+
#define LLVM_CLANG_ANALYSIS_FLOW_SENSITIVE_TESTING_SUPPORT_H_
1515

1616
#include "clang/AST/ASTContext.h"
1717
#include "clang/AST/Decl.h"
@@ -179,4 +179,4 @@ const ValueDecl *findValueDecl(ASTContext &ASTCtx, llvm::StringRef Name);
179179
} // namespace dataflow
180180
} // namespace clang
181181

182-
#endif // LLVM_CLANG_ANALYSIS_FLOWSENSITIVE_TESTING_DATAFLOWANALYSIS_H
182+
#endif // LLVM_CLANG_ANALYSIS_FLOW_SENSITIVE_TESTING_SUPPORT_H_

‎clang/unittests/Analysis/FlowSensitive/Testing/DataflowCheckerTest.cpp renamed to ‎clang/unittests/Analysis/FlowSensitive/TestingSupportTest.cpp

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
1-
//===- DataflowAnalysisTest.cpp -------------------------------------------===//
2-
//
3-
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4-
// See https://llvm.org/LICENSE.txt for license information.
5-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6-
//
7-
//===----------------------------------------------------------------------===//
8-
1+
#include "TestingSupport.h"
2+
#include "NoopAnalysis.h"
93
#include "clang/AST/ASTContext.h"
104
#include "clang/ASTMatchers/ASTMatchFinder.h"
115
#include "clang/ASTMatchers/ASTMatchers.h"
12-
#include "clang/Analysis/FlowSensitive/Testing/DataflowAnalysis.h"
13-
#include "clang/Analysis/FlowSensitive/Testing/NoopAnalysis.h"
146
#include "clang/Tooling/Tooling.h"
157
#include "llvm/Testing/Support/Error.h"
168
#include "gmock/gmock.h"

‎clang/unittests/Analysis/FlowSensitive/TransferTest.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9+
#include "NoopAnalysis.h"
10+
#include "TestingSupport.h"
911
#include "clang/AST/ASTContext.h"
1012
#include "clang/AST/Decl.h"
1113
#include "clang/ASTMatchers/ASTMatchFinder.h"
1214
#include "clang/ASTMatchers/ASTMatchers.h"
1315
#include "clang/Analysis/FlowSensitive/DataflowEnvironment.h"
1416
#include "clang/Analysis/FlowSensitive/StorageLocation.h"
15-
#include "clang/Analysis/FlowSensitive/Testing/DataflowAnalysis.h"
16-
#include "clang/Analysis/FlowSensitive/Testing/NoopAnalysis.h"
1717
#include "clang/Analysis/FlowSensitive/Value.h"
1818
#include "clang/Basic/LangStandard.h"
1919
#include "llvm/ADT/ArrayRef.h"

‎clang/unittests/Analysis/FlowSensitive/TypeErasedDataflowAnalysisTest.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9+
#include "NoopAnalysis.h"
10+
#include "TestingSupport.h"
911
#include "clang/AST/Decl.h"
1012
#include "clang/AST/ExprCXX.h"
1113
#include "clang/ASTMatchers/ASTMatchFinder.h"
@@ -15,8 +17,6 @@
1517
#include "clang/Analysis/FlowSensitive/DataflowAnalysisContext.h"
1618
#include "clang/Analysis/FlowSensitive/DataflowEnvironment.h"
1719
#include "clang/Analysis/FlowSensitive/DataflowLattice.h"
18-
#include "clang/Analysis/FlowSensitive/Testing/DataflowAnalysis.h"
19-
#include "clang/Analysis/FlowSensitive/Testing/NoopAnalysis.h"
2020
#include "clang/Analysis/FlowSensitive/Value.h"
2121
#include "clang/Analysis/FlowSensitive/WatchedLiteralsSolver.h"
2222
#include "clang/Tooling/Tooling.h"

0 commit comments

Comments
 (0)