From: Anna Zaks <ganna@apple.com>
Date: Wed, 24 Aug 2011 21:58:55 +0000 (+0000)
Subject: [analyzer] Do not use references in std::pair.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5eb7d82604970c2d2730a8b1fe5ee268b37f9844;p=clang

[analyzer] Do not use references in std::pair.

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

diff --git a/lib/StaticAnalyzer/Checkers/MacOSKeychainAPIChecker.cpp b/lib/StaticAnalyzer/Checkers/MacOSKeychainAPIChecker.cpp
index 161b8433d6..f89266f111 100644
--- a/lib/StaticAnalyzer/Checkers/MacOSKeychainAPIChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/MacOSKeychainAPIChecker.cpp
@@ -62,7 +62,7 @@ public:
   void checkEndPath(EndOfFunctionNodeBuilder &B, ExprEngine &Eng) const;
 
 private:
-  typedef std::pair<SymbolRef, const AllocationState&> AllocationPair;
+  typedef std::pair<SymbolRef, const AllocationState*> AllocationPair;
   typedef llvm::SmallVector<AllocationPair, 2> AllocationPairVec;
 
   enum APIKind {
@@ -504,7 +504,7 @@ void MacOSKeychainAPIChecker::checkPreStmt(const ReturnStmt *S,
 BugReport *MacOSKeychainAPIChecker::
   generateAllocatedDataNotReleasedReport(const AllocationPair &AP,
                                          ExplodedNode *N) const {
-  const ADFunctionInfo &FI = FunctionsToTrack[AP.second.AllocatorIdx];
+  const ADFunctionInfo &FI = FunctionsToTrack[AP.second->AllocatorIdx];
   initBugType();
   llvm::SmallString<70> sbuf;
   llvm::raw_svector_ostream os(sbuf);
@@ -537,7 +537,7 @@ void MacOSKeychainAPIChecker::checkDeadSymbols(SymbolReaper &SR,
     if (State->getSymVal(I->first) ||
         definitelyReturnedError(I->second.RetValue, State, C.getSValBuilder()))
       continue;
-    Errors.push_back(std::make_pair(I->first, I->second));
+    Errors.push_back(std::make_pair(I->first, &I->second));
   }
   if (!Changed)
     return;
@@ -576,7 +576,7 @@ void MacOSKeychainAPIChecker::checkEndPath(EndOfFunctionNodeBuilder &B,
                                 Eng.getSValBuilder())) {
       continue;
     }
-    Errors.push_back(std::make_pair(I->first, I->second));
+    Errors.push_back(std::make_pair(I->first, &I->second));
   }
 
   // If no change, do not generate a new state.