Skip to content

Commit 78ff12d

Browse files
committed
Revert "[clang][dataflow] Add framework for testing analyses."
Doesn't build on Windows. This reverts commit 5a40df6 and commit db494bd.
1 parent 6fae235 commit 78ff12d

File tree

7 files changed

+4
-547
lines changed

7 files changed

+4
-547
lines changed

clang/include/clang/Analysis/FlowSensitive/TypeErasedDataflowAnalysis.h

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,7 @@ struct TypeErasedDataflowAnalysisState {
7878

7979
/// Transfers the state of a basic block by evaluating each of its statements in
8080
/// the context of `Analysis` and the states of its predecessors that are
81-
/// available in `BlockStates`. `HandleTransferredStmt` (if provided) will be
82-
/// applied to each statement in the block, after it is evaluated.
81+
/// available in `BlockStates`.
8382
///
8483
/// Requirements:
8584
///
@@ -89,10 +88,7 @@ struct TypeErasedDataflowAnalysisState {
8988
TypeErasedDataflowAnalysisState transferBlock(
9089
std::vector<llvm::Optional<TypeErasedDataflowAnalysisState>> &BlockStates,
9190
const CFGBlock &Block, const Environment &InitEnv,
92-
TypeErasedDataflowAnalysis &Analysis,
93-
std::function<void(const CFGStmt &,
94-
const TypeErasedDataflowAnalysisState &)>
95-
HandleTransferredStmt = nullptr);
91+
TypeErasedDataflowAnalysis &Analysis);
9692

9793
/// Performs dataflow analysis and returns a mapping from basic block IDs to
9894
/// dataflow analysis states that model the respective basic blocks. Indices

clang/lib/Analysis/FlowSensitive/TypeErasedDataflowAnalysis.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,7 @@ static TypeErasedDataflowAnalysisState computeBlockInputState(
6666
TypeErasedDataflowAnalysisState transferBlock(
6767
std::vector<llvm::Optional<TypeErasedDataflowAnalysisState>> &BlockStates,
6868
const CFGBlock &Block, const Environment &InitEnv,
69-
TypeErasedDataflowAnalysis &Analysis,
70-
std::function<void(const CFGStmt &,
71-
const TypeErasedDataflowAnalysisState &)>
72-
HandleTransferredStmt) {
69+
TypeErasedDataflowAnalysis &Analysis) {
7370
TypeErasedDataflowAnalysisState State =
7471
computeBlockInputState(BlockStates, Block, InitEnv, Analysis);
7572
for (const CFGElement &Element : Block) {
@@ -82,8 +79,6 @@ TypeErasedDataflowAnalysisState transferBlock(
8279

8380
State.Lattice = Analysis.transferTypeErased(Stmt.getValue().getStmt(),
8481
State.Lattice, State.Env);
85-
if (HandleTransferredStmt != nullptr)
86-
HandleTransferredStmt(Stmt.getValue(), State);
8782
}
8883
return State;
8984
}

clang/unittests/Analysis/FlowSensitive/CMakeLists.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ set(LLVM_LINK_COMPONENTS
33
)
44

55
add_clang_unittest(ClangAnalysisFlowSensitiveTests
6-
TestingSupport.cpp
7-
TestingSupportTest.cpp
86
TypeErasedDataflowAnalysisTest.cpp
97
)
108

@@ -16,13 +14,8 @@ clang_target_link_libraries(ClangAnalysisFlowSensitiveTests
1614
clangASTMatchers
1715
clangBasic
1816
clangFrontend
19-
clangLex
2017
clangSerialization
2118
clangTesting
2219
clangTooling
2320
)
2421

25-
target_link_libraries(ClangAnalysisFlowSensitiveTests
26-
PRIVATE
27-
LLVMTestingSupport
28-
)

clang/unittests/Analysis/FlowSensitive/TestingSupport.cpp

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

0 commit comments

Comments
 (0)