maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "[analyzer] Break cycles (optionally) when trimming an ExplodedGraph." 

The algorithm used here was ridiculously slow when a potential back-edge
pointed to a node that already had a lot of successors. The previous commit
makes this feature unnecessary anyway.

This reverts r177468 / f4cf6b10f863b9bc716a09b2b2a8c497dcc6aa9b.

Conflicts:

	lib/StaticAnalyzer/Core/BugReporter.cpp

llvm-svn: 177765
This commit is contained in:
Jordan Rose 2013-03-22 21:15:33 +00:00
parent f342adef47
commit 25fac2f6dc
3 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clang/include/clang/StaticAnalyzer/Core/PathSensitive/ExplodedGraph.h
View File

@ -363,16 +363,12 @@ public:
///
/// \param Nodes The nodes which must appear in the final graph. Presumably
/// these are end-of-path nodes (i.e. they have no successors).
/// \param BreakCycles Whether or not the trimmed graph should make an effort
/// to eliminate cycles. Note that this may result in some
/// unnecessary nodes being included in the final graph
/// (i.e. nodes that would have only appeared in a cycle).
/// \param[out] ForwardMap A optional map from nodes in this graph to nodes in
/// the returned graph.
/// \param[out] InverseMap An optional map from nodes in the returned graph to
/// nodes in this graph.
/// \returns The trimmed graph
ExplodedGraph *trim(ArrayRef<const NodeTy *> Nodes, bool BreakCycles = false,
ExplodedGraph *trim(ArrayRef<const NodeTy *> Nodes,
InterExplodedGraphMap *ForwardMap = 0,
InterExplodedGraphMap *InverseMap = 0) const;

3
clang/lib/StaticAnalyzer/Core/BugReporter.cpp
View File

@ -1936,8 +1936,7 @@ TrimmedGraph::TrimmedGraph(const ExplodedGraph *OriginalGraph,
// The trimmed graph is created in the body of the constructor to ensure
// that the DenseMaps have been initialized already.
InterExplodedGraphMap ForwardMap;
G.reset(OriginalGraph->trim(Nodes, /*BreakCycles=*/false,
&ForwardMap, &InverseMap));
G.reset(OriginalGraph->trim(Nodes, &ForwardMap, &InverseMap));
// Find the (first) error node in the trimmed graph. We just need to consult
// the node map which maps from nodes in the original graph to nodes

19
clang/lib/StaticAnalyzer/Core/ExplodedGraph.cpp
View File

@ -331,22 +331,8 @@ ExplodedNode *ExplodedGraph::getNode(const ProgramPoint &L,
return V;
}
static bool isDescendent(const ExplodedNode *Parent, const ExplodedNode *Child){
SmallVector<const ExplodedNode *, 16> WL;
WL.push_back(Parent);
while (!WL.empty()) {
const ExplodedNode *N = WL.pop_back_val();
if (N == Child)
return true;
WL.append(N->succ_begin(), N->succ_end());
}
return false;
}
ExplodedGraph *
ExplodedGraph::trim(ArrayRef<const NodeTy *> Sinks, bool BreakCycles,
ExplodedGraph::trim(ArrayRef<const NodeTy *> Sinks,
InterExplodedGraphMap *ForwardMap,
InterExplodedGraphMap *InverseMap) const{
@ -443,8 +429,7 @@ ExplodedGraph::trim(ArrayRef<const NodeTy *> Sinks, bool BreakCycles,
I != E; ++I) {
Pass2Ty::iterator PI = Pass2.find(*I);
if (PI != Pass2.end()) {
if (!BreakCycles || !isDescendent(PI->second, NewN))
const_cast<ExplodedNode *>(PI->second)->addPredecessor(NewN, *G);
const_cast<ExplodedNode *>(PI->second)->addPredecessor(NewN, *G);
continue;
}