diff options
| -rw-r--r-- | lib/AST/Expr.cpp | 3 | ||||
| -rw-r--r-- | test/Sema/compound-literal.c | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/AST/Expr.cpp b/lib/AST/Expr.cpp index b31ec2314d..dbfe2d52b8 100644 --- a/lib/AST/Expr.cpp +++ b/lib/AST/Expr.cpp @@ -1764,6 +1764,9 @@ bool Expr::isConstantInitializer(ASTContext &Ctx, bool IsForRef) const { case ParenExprClass: return cast<ParenExpr>(this)->getSubExpr() ->isConstantInitializer(Ctx, IsForRef); + case ChooseExprClass: + return cast<ChooseExpr>(this)->getChosenSubExpr(Ctx) + ->isConstantInitializer(Ctx, IsForRef); case UnaryOperatorClass: { const UnaryOperator* Exp = cast<UnaryOperator>(this); if (Exp->getOpcode() == UO_Extension) diff --git a/test/Sema/compound-literal.c b/test/Sema/compound-literal.c index aade4641ac..4130762599 100644 --- a/test/Sema/compound-literal.c +++ b/test/Sema/compound-literal.c @@ -3,9 +3,10 @@ struct foo { int a, b; }; static struct foo t = (struct foo){0,0}; -static struct foo t2 = {0,0}; +static struct foo t1 = __builtin_choose_expr(0, (struct foo){0,0}, (struct foo){0,0}); +static struct foo t2 = {0,0}; static struct foo t3 = t2; // -expected-error {{initializer element is not a compile-time constant}} -static int *p = (int []){2,4}; +static int *p = (int []){2,4}; static int x = (int){1}; static int *p2 = (int []){2,x}; // -expected-error {{initializer element is not a compile-time constant}} |