[analyzer] Refactor PathDiagnosticLocation: Lazily query LocationContext for a Parent...

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@140147 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h b/include/clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h
index 55179779b4d7a4134e21db051fb7fd6a57a05251..326635d90ca6fc5590f0760a54796671903f21d3 100644 (file)
--- a/include/clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h
+++ b/include/clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h
@@ -98,8 +98,8 @@ private:
   FullSourceLoc Loc;
   PathDiagnosticRange Range;
 
-  FullSourceLoc genLocation(const ParentMap *PM=0) const;
-  PathDiagnosticRange genRange(const ParentMap *PM=0) const;
+  FullSourceLoc genLocation(const LocationContext *LC=0) const;
+  PathDiagnosticRange genRange(const LocationContext *LC=0) const;
 
 public:
   PathDiagnosticLocation()
@@ -119,7 +119,10 @@ public:
 
   PathDiagnosticLocation(const Stmt *s,
                          const SourceManager &sm,
-                         const LocationContext *lc);
+                         const LocationContext *lc)
+    : K(StmtK), S(s), D(0), SM(&sm),
+      Loc(genLocation(lc)), Range(genRange(lc)) {}
+
 
   PathDiagnosticLocation(const Decl *d, const SourceManager &sm)
     : K(DeclK), S(0), D(d), SM(&sm),

diff --git a/lib/StaticAnalyzer/Core/PathDiagnostic.cpp b/lib/StaticAnalyzer/Core/PathDiagnostic.cpp
index 6ef2b075b335c8d0f1fd90e89fa5d50d17745b8c..1d03b6699702ae962cbaa01405643766c4e0c9a1 100644 (file)
--- a/lib/StaticAnalyzer/Core/PathDiagnostic.cpp
+++ b/lib/StaticAnalyzer/Core/PathDiagnostic.cpp
@@ -131,37 +131,28 @@ void PathDiagnosticClient::HandlePathDiagnostic(const PathDiagnostic *D) {
 //===----------------------------------------------------------------------===//
 
 static SourceLocation getValidSourceLocation(const Stmt* S,
-                                             const ParentMap &PM) {
+                                             const LocationContext *LC) {
   SourceLocation L = S->getLocStart();
 
   // S might be a temporary statement that does not have a location in the
   // source code, so find an enclosing statement and use it's location.
-  while (!L.isValid()) {
-    S = PM.getParent(S);
-    L = S->getLocStart();
+  if (!L.isValid()) {
+    const ParentMap &PM = LC->getParentMap();
+
+    while (!L.isValid()) {
+      S = PM.getParent(S);
+      L = S->getLocStart();
+    }
   }
 
   return L;
 }
 
-PathDiagnosticLocation::PathDiagnosticLocation(const Stmt *s,
-                                               const SourceManager &sm,
-                                               const LocationContext *lc)
-  : K(StmtK), S(s), D(0), SM(&sm)
-{
-  const ParentMap* PM = 0;
-  if (lc)
-    PM = &lc->getParentMap();
-
-  Loc = genLocation(PM);
-  Range = genRange(PM);
-}
-
 PathDiagnosticLocation
   PathDiagnosticLocation::createBeginStmt(const Stmt *S,
                                           const SourceManager &SM,
                                           const LocationContext *LC) {
-  return PathDiagnosticLocation(getValidSourceLocation(S, LC->getParentMap()),
+  return PathDiagnosticLocation(getValidSourceLocation(S, LC),
                                 SM, SingleLocK);
 }
 
@@ -255,7 +246,7 @@ PathDiagnosticLocation PathDiagnosticLocation::createSingleLocation(
 }
 
 FullSourceLoc
-  PathDiagnosticLocation::genLocation(const ParentMap *PM) const {
+  PathDiagnosticLocation::genLocation(const LocationContext *LC) const {
   assert(isValid());
   // Note that we want a 'switch' here so that the compiler can warn us in
   // case we add more cases.
@@ -264,7 +255,7 @@ FullSourceLoc
     case RangeK:
       break;
     case StmtK:
-      return FullSourceLoc(getValidSourceLocation(S, *PM),
+      return FullSourceLoc(getValidSourceLocation(S, LC),
                            const_cast<SourceManager&>(*SM));
     case DeclK:
       return FullSourceLoc(D->getLocation(), const_cast<SourceManager&>(*SM));
@@ -274,7 +265,7 @@ FullSourceLoc
 }
 
 PathDiagnosticRange
-  PathDiagnosticLocation::genRange(const ParentMap *PM) const {
+  PathDiagnosticLocation::genRange(const LocationContext *LC) const {
   assert(isValid());
   // Note that we want a 'switch' here so that the compiler can warn us in
   // case we add more cases.
@@ -309,7 +300,7 @@ PathDiagnosticRange
         case Stmt::BinaryConditionalOperatorClass:
         case Stmt::ConditionalOperatorClass:
         case Stmt::ObjCForCollectionStmtClass: {
-          SourceLocation L = getValidSourceLocation(S, *PM);
+          SourceLocation L = getValidSourceLocation(S, LC);
           return SourceRange(L, L);
         }
       }