Bring buildbots back. Fix scoping issue and coding style from r163397.

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

1 files changed, 8 insertions, 6 deletions

diff --git a/lib/Analysis/ThreadSafety.cpp b/lib/Analysis/ThreadSafety.cpp
index d016c3eb2d..06ae32c3f1 100644
--- a/lib/Analysis/ThreadSafety.cpp
+++ b/lib/Analysis/ThreadSafety.cpp
@@ -821,17 +821,19 @@ public:
   }
 
   LockData* findLock(FactManager& FM, const SExpr& M) const {
-    for (const_iterator I=begin(), E=end(); I != E; ++I) {
-      const SExpr& E = FM[*I].MutID;
-      if (E.matches(M)) return &FM[*I].LDat;
+    for (const_iterator I = begin(), E = end(); I != E; ++I) {
+      const SExpr& Exp = FM[*I].MutID;
+      if (Exp.matches(M))
+        return &FM[*I].LDat;
     }
     return 0;
   }
 
   LockData* findLockUniv(FactManager& FM, const SExpr& M) const {
-    for (const_iterator I=begin(), E=end(); I != E; ++I) {
-      const SExpr& E = FM[*I].MutID;
-      if (E.matches(M) || E.isUniversal()) return &FM[*I].LDat;
+    for (const_iterator I = begin(), E = end(); I != E; ++I) {
+      const SExpr& Exp = FM[*I].MutID;
+      if (Exp.matches(M) || Exp.isUniversal())
+        return &FM[*I].LDat;
     }
     return 0;
   }