aboutsummaryrefslogtreecommitdiff
path: root/lib/Sema/SemaChecking.cpp
diff options
context:
space:
mode:
authorJohn McCall <rjmccall@apple.com>2010-11-11 05:33:51 +0000
committerJohn McCall <rjmccall@apple.com>2010-11-11 05:33:51 +0000
commit91b6014876e9186f968f74a8975ab8fc08ef1b68 (patch)
treed0cf685bcdb3856951aa2cf5daf52cba83b6c71d /lib/Sema/SemaChecking.cpp
parentc84aca4b50ce29a66c9f18df49542c9f0dd025d4 (diff)
Undo a refactor-o and base the bitfield-truncation warning on the
uncoerced value. Also, whitelist bool bitfields, which aren't really a truncation. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@118778 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaChecking.cpp')
-rw-r--r--lib/Sema/SemaChecking.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/Sema/SemaChecking.cpp b/lib/Sema/SemaChecking.cpp
index 4fc16f51ee..56a0c076ad 100644
--- a/lib/Sema/SemaChecking.cpp
+++ b/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;