diff --git a/clang/lib/StaticAnalyzer/Checkers/IteratorModeling.cpp b/clang/lib/StaticAnalyzer/Checkers/IteratorModeling.cpp
--- a/clang/lib/StaticAnalyzer/Checkers/IteratorModeling.cpp
+++ b/clang/lib/StaticAnalyzer/Checkers/IteratorModeling.cpp
@@ -1100,7 +1100,7 @@
 
   if (!ContMap.isEmpty()) {
     Out << Sep << "Container Data :" << NL;
-    for (const auto Cont : ContMap) {
+    for (const auto &Cont : ContMap) {
       Cont.first->dumpToStream(Out);
       Out << " : [ ";
       const auto CData = Cont.second;
@@ -1122,7 +1122,7 @@
 
   if (!SymbolMap.isEmpty() || !RegionMap.isEmpty()) {
     Out << Sep << "Iterator Positions :" << NL;
-    for (const auto Sym : SymbolMap) {
+    for (const auto &Sym : SymbolMap) {
       Sym.first->dumpToStream(Out);
       Out << " : ";
       const auto Pos = Sym.second;
@@ -1132,7 +1132,7 @@
       Pos.getOffset()->dumpToStream(Out);
     }
 
-    for (const auto Reg : RegionMap) {
+    for (const auto &Reg : RegionMap) {
       Reg.first->dumpToStream(Out);
       Out << " : ";
       const auto Pos = Reg.second;
diff --git a/clang/lib/StaticAnalyzer/Checkers/MoveChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/MoveChecker.cpp
--- a/clang/lib/StaticAnalyzer/Checkers/MoveChecker.cpp
+++ b/clang/lib/StaticAnalyzer/Checkers/MoveChecker.cpp
@@ -686,7 +686,7 @@
                                    CheckerContext &C) const {
   ProgramStateRef State = C.getState();
   TrackedRegionMapTy TrackedRegions = State->get<TrackedRegionMap>();
-  for (TrackedRegionMapTy::value_type E : TrackedRegions) {
+  for (const auto &E : TrackedRegions) {
     const MemRegion *Region = E.first;
     bool IsRegDead = !SymReaper.isLiveRegion(Region);
 
diff --git a/clang/lib/StaticAnalyzer/Frontend/CheckerRegistry.cpp b/clang/lib/StaticAnalyzer/Frontend/CheckerRegistry.cpp
--- a/clang/lib/StaticAnalyzer/Frontend/CheckerRegistry.cpp
+++ b/clang/lib/StaticAnalyzer/Frontend/CheckerRegistry.cpp
@@ -591,7 +591,8 @@
                                          /*MinLineWidth*/ 90);
     Out << "\n\n";
   };
-  for (const std::pair<StringRef, const CmdLineOption &> &Entry : OptionMap) {
+  for (const std::pair<const StringRef, const CmdLineOption &> &Entry :
+       OptionMap) {
     const CmdLineOption &Option = Entry.second;
     std::string FullOption = (Entry.first + ":" + Option.OptionName).str();