diff --git a/include/clang/AST/RecursiveASTVisitor.h b/include/clang/AST/RecursiveASTVisitor.h
index 8a6e85f226abb709b7cd0ff9eb2f54ab2ad11a2b..a9a98d77ba2731634f0886a812256c69fc4cdc85 100644
--- a/include/clang/AST/RecursiveASTVisitor.h
+++ b/include/clang/AST/RecursiveASTVisitor.h
@@ -1400,6 +1400,7 @@ bool RecursiveASTVisitor<Derived>::TraverseClassInstantiations(
     case TSK_Undeclared:
     case TSK_ImplicitInstantiation:
       TRY_TO(TraverseDecl(SD));
+      break;
 
     // We don't need to do anything on an explicit instantiation
     // or explicit specialization because there will be an explicit
diff --git a/include/clang/Analysis/Analyses/FormatString.h b/include/clang/Analysis/Analyses/FormatString.h
index 9ec27ce91dba28817f7ffe5024c459860370a018..f99b97a1898a0511e18b48502a86ab4805b0f019 100644
--- a/include/clang/Analysis/Analyses/FormatString.h
+++ b/include/clang/Analysis/Analyses/FormatString.h
@@ -175,6 +175,7 @@ public:
     switch (kind) {
       case PrintErrno:
         assert(IsPrintf);
+        return false;
       case PercentArg:
         return false;
       default: