Index: lib/Basic/DiagnosticIDs.cpp
===================================================================
--- lib/Basic/DiagnosticIDs.cpp
+++ lib/Basic/DiagnosticIDs.cpp
@@ -709,10 +709,7 @@
     return false;
 
   // Currently we consider all ARC errors as recoverable.
-  if (isARCDiagnostic(DiagID))
-    return false;
-
-  return true;
+  return !isARCDiagnostic(DiagID);
 }
 
 bool DiagnosticIDs::isARCDiagnostic(unsigned DiagID) {
Index: lib/Basic/VirtualFileSystem.cpp
===================================================================
--- lib/Basic/VirtualFileSystem.cpp
+++ lib/Basic/VirtualFileSystem.cpp
@@ -838,9 +838,7 @@
     if (Stream.failed())
       return false;
 
-    if (!checkMissingKeys(Top, Keys))
-      return false;
-    return true;
+    return checkMissingKeys(Top, Keys);
   }
 };
 } // end of anonymous namespace