Teach Sema::ActOnCompoundLiteral about constraint C99 6.5.2.5p3.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@45782 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Sema/SemaExpr.cpp b/Sema/SemaExpr.cpp
index 7d224c5e802c84889c674321dab19808b79dc717..897432578bc176e4c79b4ecea34a483c624fa0b5 100644 (file)
--- a/Sema/SemaExpr.cpp
+++ b/Sema/SemaExpr.cpp
@@ -664,8 +664,9 @@ ActOnCompoundLiteral(SourceLocation LParenLoc, TypeTy *Ty,
   Expr *literalExpr = static_cast<Expr*>(InitExpr);
 
   // FIXME: add more semantic analysis (C99 6.5.2.5).
-  if (CheckInitializer(literalExpr, literalType, false))
-    return 0;
+  bool requireConstantExprs = !CurFunctionDecl && !CurMethodDecl;
+  if (CheckInitializer(literalExpr, literalType, requireConstantExprs))
+    return true;
 
   return new CompoundLiteralExpr(LParenLoc, literalType, literalExpr);
 }

diff --git a/test/Sema/compound-literal.c b/test/Sema/compound-literal.c
index 2c9595c50e46630364d538e73d1b616f6a8ea78e..12ee9f9300ac32d105cce4ca11278b714f252ccb 100644 (file)
--- a/test/Sema/compound-literal.c
+++ b/test/Sema/compound-literal.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang -fsyntax-only -verify -pedantic %s
 
 struct foo { int a, b; };
 
@@ -8,9 +8,13 @@ static struct foo t3 = t2; // -expected-error {{initializer element is not const
 static int *p = (int []){2,4}; 
 static int x = (int){1}; // -expected-error {{initializer element is not constant}} -expected-warning{{braces around scalar initializer}}
 
+static int *p2 = (int []){2,x}; // -expected-error {{initializer element is not constant}}
+static int *p3 = (int []){2,"x"}; // -expected-warning {{incompatible pointer to integer conversion initializing 'char *', expected 'int'}}
+
 extern void fooFunc(struct foo *pfoo);
 
 int main(int argc, char **argv) {
+ int *l = (int []){x, *p, *p2};
  fooFunc(&(struct foo){ 1, 2 });
 }