Undo a refactor-o and base the bitfield-truncation warning on the

uncoerced value.  Also, whitelist bool bitfields, which aren't
really a truncation.

llvm-svn: 118778

1 files changed, 5 insertions, 1 deletions

diff --git a/clang/lib/Sema/SemaChecking.cpp b/clang/lib/Sema/SemaChecking.cpp
index 4fc16f51ee0..56a0c076ad3 100644
--- a/clang/lib/Sema/SemaChecking.cpp
+++ b/clang/lib/Sema/SemaChecking.cpp
@@ -2617,12 +2617,16 @@ bool AnalyzeBitFieldAssignment(Sema &S, FieldDecl *Bitfield, Expr *Init,
   if (Bitfield->isInvalidDecl())
     return false;
 
+  // White-list bool bitfields.
+  if (Bitfield->getType()->isBooleanType())
+    return false;
+
   Expr *OriginalInit = Init->IgnoreParenImpCasts();
 
   llvm::APSInt Width(32);
   Expr::EvalResult InitValue;
   if (!Bitfield->getBitWidth()->isIntegerConstantExpr(Width, S.Context) ||
-      !Init->Evaluate(InitValue, S.Context) ||
+      !OriginalInit->Evaluate(InitValue, S.Context) ||
       !InitValue.Val.isInt())
     return false;