revert r354873 as this breaks lldb builds.

llvm-svn: 354875

1 files changed, 7 insertions, 4 deletions

diff --git a/clang/lib/CodeGen/CGExpr.cpp b/clang/lib/CodeGen/CGExpr.cpp
index 09ba2a0eb71..5ee0378efe4 100644
--- a/clang/lib/CodeGen/CGExpr.cpp
+++ b/clang/lib/CodeGen/CGExpr.cpp
@@ -2855,13 +2855,16 @@ enum class CheckRecoverableKind {
 }
 
 static CheckRecoverableKind getRecoverableKind(SanitizerMask Kind) {
-  assert(Kind.countPopulation() == 1);
-  if (Kind == SanitizerKind::Vptr)
+  assert(llvm::countPopulation(Kind) == 1);
+  switch (Kind) {
+  case SanitizerKind::Vptr:
     return CheckRecoverableKind::AlwaysRecoverable;
-  else if (Kind == SanitizerKind::Return || Kind == SanitizerKind::Unreachable)
+  case SanitizerKind::Return:
+  case SanitizerKind::Unreachable:
     return CheckRecoverableKind::Unrecoverable;
-  else
+  default:
     return CheckRecoverableKind::Recoverable;
+  }
 }
 
 namespace {