2 files changed, 7 insertions, 2 deletions
diff --git a/clang/lib/Analysis/ThreadSafety.cpp b/clang/lib/Analysis/ThreadSafety.cpp
index b7d94db1056..297928dd97c 100644
--- a/clang/lib/Analysis/ThreadSafety.cpp
+++ b/clang/lib/Analysis/ThreadSafety.cpp
@@ -300,6 +300,7 @@ class BuildLockset : public StmtVisitor<BuildLockset> {
       case LK_Exclusive:
         return locksetContains(Lock, KindRequested);
     }
+    llvm_unreachable("Unknown LockKind");
   }
 
 public:
@@ -805,5 +806,6 @@ LockKind getLockKindFromAccessKind(AccessKind AK) {
     case AK_Written :
       return LK_Exclusive;
   }
+  llvm_unreachable("Unknown AccessKind");
 }
 }} // end namespace clang::thread_safety
diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp
index c200daedfbb..cce4057dd74 100644
--- a/clang/lib/Sema/SemaOverload.cpp
+++ b/clang/lib/Sema/SemaOverload.cpp
@@ -7288,10 +7288,12 @@ SourceLocation GetLocationForCandidate(const OverloadCandidate *Cand) {
   return SourceLocation();
 }
 
-static unsigned RankDeductionFailure(
-    const OverloadCandidate::DeductionFailureInfo &DFI) {
+static unsigned
+RankDeductionFailure(const OverloadCandidate::DeductionFailureInfo &DFI) {
   switch ((Sema::TemplateDeductionResult)DFI.Result) {
   case Sema::TDK_Success:
+    assert(0 && "TDK_success while diagnosing bad deduction");
+
   case Sema::TDK_Incomplete:
     return 1;
 
@@ -7314,6 +7316,7 @@ static unsigned RankDeductionFailure(
   case Sema::TDK_TooFewArguments:
     return 6;
   }
+  llvm_unreachable("Unhandled deduction result");
 }
 
 struct CompareOverloadCandidatesForDisplay {