2 files changed, 14 insertions, 0 deletions
diff --git a/lib/AST/Expr.cpp b/lib/AST/Expr.cpp
index b004bde7bd..5107a5643c 100644
--- a/lib/AST/Expr.cpp
+++ b/lib/AST/Expr.cpp
@@ -720,6 +720,13 @@ bool Expr::isIntegerConstantExpr(llvm::APSInt &Result, ASTContext &Ctx,
     Result.setIsUnsigned(!getType()->isSignedIntegerType());
     break;
   }
+  case CXXBoolLiteralExprClass: {
+    const CXXBoolLiteralExpr *BL = cast<CXXBoolLiteralExpr>(this);
+    Result.zextOrTrunc(static_cast<uint32_t>(Ctx.getTypeSize(getType())));
+    Result = BL->getValue();
+    Result.setIsUnsigned(!getType()->isSignedIntegerType());
+    break;
+  }
   case CXXZeroInitValueExprClass:
     Result.clear();
     break;
diff --git a/test/SemaCXX/bool.cpp b/test/SemaCXX/bool.cpp
new file mode 100644
index 0000000000..e35495abab
--- /dev/null
+++ b/test/SemaCXX/bool.cpp
@@ -0,0 +1,7 @@
+// RUN: clang -fsyntax-only -verify %s 
+
+// Bool literals can be enum values.
+enum {
+  ReadWrite = false,
+  ReadOnly = true
+};