Fix PR3386 by handling GCC's rules for alignof, which are substantially
different than those for sizeof. Reject alignof(bitfield) like gcc does.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@62928 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index fa4c9d6..56ad4b5 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -1035,6 +1035,27 @@
ExprRange);
}
+bool Sema::CheckAlignOfExpr(Expr *E, SourceLocation OpLoc,
+ const SourceRange &ExprRange) {
+ E = E->IgnoreParens();
+
+ // alignof decl is always ok.
+ if (isa<DeclRefExpr>(E))
+ return false;
+
+ if (MemberExpr *ME = dyn_cast<MemberExpr>(E)) {
+ if (FieldDecl *FD = dyn_cast<FieldDecl>(ME->getMemberDecl())) {
+ if (FD->isBitField()) {
+ Diag(OpLoc, diag::err_alignof_bitfield) << ExprRange;
+ return true;
+ }
+ // Other fields are ok.
+ return false;
+ }
+ }
+ return CheckSizeOfAlignOfOperand(E->getType(), OpLoc, ExprRange, false);
+}
+
/// ActOnSizeOfAlignOfExpr - Handle @c sizeof(type) and @c sizeof @c expr and
/// the same for @c alignof and @c __alignof
/// Note that the ArgRange is invalid if isType is false.
@@ -1060,7 +1081,13 @@
ArgTy = ArgEx->getType();
// Verify that the operand is valid.
- if (CheckSizeOfAlignOfOperand(ArgTy, OpLoc, Range, isSizeof)) {
+ bool isInvalid;
+ if (isSizeof)
+ isInvalid = CheckSizeOfAlignOfOperand(ArgTy, OpLoc, Range, true);
+ else
+ isInvalid = CheckAlignOfExpr(ArgEx, OpLoc, Range);
+
+ if (isInvalid) {
DeleteExpr(ArgEx);
return ExprError();
}