aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAnna Zaks <ganna@apple.com>2011-09-20 16:23:37 +0000
committerAnna Zaks <ganna@apple.com>2011-09-20 16:23:37 +0000
commit23803374d8db054192ea6fcb766b87e04f26c8fb (patch)
tree2f5bfd0985039557f874e0bb970f33aa09d81ec0 /lib
parent68018db76756c6959db15160055fd8da6bec5bec (diff)
[analyzer] Remove LocationContext and a dependency from PathDiagnosticLoaction.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@140146 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r--lib/StaticAnalyzer/Core/BugReporter.cpp2
-rw-r--r--lib/StaticAnalyzer/Core/PathDiagnostic.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/StaticAnalyzer/Core/BugReporter.cpp b/lib/StaticAnalyzer/Core/BugReporter.cpp
index 043f5d2b81..7a0a5430aa 100644
--- a/lib/StaticAnalyzer/Core/BugReporter.cpp
+++ b/lib/StaticAnalyzer/Core/BugReporter.cpp
@@ -877,7 +877,7 @@ class EdgeBuilder {
}
if (S != Original)
- L = PathDiagnosticLocation(S, L.getManager(), L.getLocationContext());
+ L = PathDiagnosticLocation(S, L.getManager(), PDB.getLocationContext());
}
if (firstCharOnly)
diff --git a/lib/StaticAnalyzer/Core/PathDiagnostic.cpp b/lib/StaticAnalyzer/Core/PathDiagnostic.cpp
index 40b73deacb..6ef2b075b3 100644
--- a/lib/StaticAnalyzer/Core/PathDiagnostic.cpp
+++ b/lib/StaticAnalyzer/Core/PathDiagnostic.cpp
@@ -147,7 +147,7 @@ static SourceLocation getValidSourceLocation(const Stmt* S,
PathDiagnosticLocation::PathDiagnosticLocation(const Stmt *s,
const SourceManager &sm,
const LocationContext *lc)
- : K(StmtK), S(s), D(0), SM(&sm), LC(lc)
+ : K(StmtK), S(s), D(0), SM(&sm)
{
const ParentMap* PM = 0;
if (lc)
@@ -264,7 +264,7 @@ FullSourceLoc
case RangeK:
break;
case StmtK:
- return FullSourceLoc(getValidSourceLocation(S, LC->getParentMap()),
+ return FullSourceLoc(getValidSourceLocation(S, *PM),
const_cast<SourceManager&>(*SM));
case DeclK:
return FullSourceLoc(D->getLocation(), const_cast<SourceManager&>(*SM));
@@ -309,7 +309,7 @@ PathDiagnosticRange
case Stmt::BinaryConditionalOperatorClass:
case Stmt::ConditionalOperatorClass:
case Stmt::ObjCForCollectionStmtClass: {
- SourceLocation L = getValidSourceLocation(S, LC->getParentMap());
+ SourceLocation L = getValidSourceLocation(S, *PM);
return SourceRange(L, L);
}
}