diff options
| -rw-r--r-- | lib/Sema/SemaDecl.cpp | 7 | ||||
| -rw-r--r-- | test/Sema/init.c | 8 |
2 files changed, 15 insertions, 0 deletions
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index 7e60da5af3..564f530191 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -1163,6 +1163,13 @@ bool Sema::CheckArithmeticConstantExpression(const Expr* Init) { if (SubExpr->getType()->isArithmeticType()) return CheckArithmeticConstantExpression(SubExpr); + if (SubExpr->getType()->isPointerType()) { + const Expr* Base = FindExpressionBaseAddress(SubExpr); + // If the pointer has a null base, this is an offsetof-like construct + if (!Base) + return CheckAddressConstantExpression(SubExpr); + } + Diag(Init->getExprLoc(), diag::err_init_element_not_constant, Init->getSourceRange()); return true; diff --git a/test/Sema/init.c b/test/Sema/init.c index 964118ce02..10eed146a0 100644 --- a/test/Sema/init.c +++ b/test/Sema/init.c @@ -58,3 +58,11 @@ union { float f; unsigned u; } u = { 1.0f }; int f3(int x) { return x; } typedef void (*vfunc)(void); void *bar = (vfunc) f3; + +// PR2747 +struct sym_reg { + char nc_gpreg; +}; +int sym_fw1a_scr[] = { + ((int)(&((struct sym_reg *)0)->nc_gpreg)) & 0 +}; |