Split logic for 'getEndPath()' for CFRefReport and CFRefLeakReport.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@64034 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/CFRefCount.cpp b/lib/Analysis/CFRefCount.cpp
index a530905..97bf4fc 100644
--- a/lib/Analysis/CFRefCount.cpp
+++ b/lib/Analysis/CFRefCount.cpp
@@ -2091,6 +2091,7 @@
//===---------===//
class VISIBILITY_HIDDEN CFRefReport : public RangedBugReport {
+ protected:
SymbolRef Sym;
public:
CFRefReport(CFRefBug& D, ExplodedNode<GRState> *n, SymbolRef sym)
@@ -2132,7 +2133,10 @@
public:
CFRefLeakReport(CFRefBug& D, ExplodedNode<GRState> *n, SymbolRef sym)
: CFRefReport(D, n, sym) {}
-
+
+ PathDiagnosticPiece* getEndPath(BugReporter& BR,
+ const ExplodedNode<GRState>* N);
+
SourceLocation getLocation() const;
};
} // end anonymous namespace
@@ -2415,16 +2419,22 @@
CFRefReport::getEndPath(BugReporter& br, const ExplodedNode<GRState>* EndN) {
GRBugReporter& BR = cast<GRBugReporter>(br);
-
// Tell the BugReporter to report cases when the tracked symbol is
// assigned to different variables, etc.
cast<GRBugReporter>(BR).addNotableSymbol(Sym);
-
- if (!getBugType().isLeak())
- return RangedBugReport::getEndPath(BR, EndN);
-
- // We are a leak. Walk up the graph to get to the first node where the
- // symbol appeared, and also get the first VarDecl that tracked object
+ return RangedBugReport::getEndPath(BR, EndN);
+}
+
+PathDiagnosticPiece*
+CFRefLeakReport::getEndPath(BugReporter& br, const ExplodedNode<GRState>* EndN){
+
+ GRBugReporter& BR = cast<GRBugReporter>(br);
+ // Tell the BugReporter to report cases when the tracked symbol is
+ // assigned to different variables, etc.
+ cast<GRBugReporter>(BR).addNotableSymbol(Sym);
+
+ // We are reporting a leak. Walk up the graph to get to the first node where
+ // the symbol appeared, and also get the first VarDecl that tracked object
// is stored to.
const ExplodedNode<GRState>* AllocNode = 0;
const MemRegion* FirstBinding = 0;