From: Marek Polacek <polacek@redhat.com>
Date: Sun, 19 Oct 2014 16:47:35 +0000 (+0000)
Subject: re PR c/63567 (Linux kernel build error due to non-static initializers)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4435bb9232cf3a3ab015f7bc0f8dbe562bd8e0c8;p=gcc.git

re PR c/63567 (Linux kernel build error due to non-static initializers)

	PR c/63567
	* c-typeck.c (output_init_element): Allow initializing objects with
	static storage duration with compound literals even in C99 and add
	pedwarn for it.

	* gcc.dg/pr63567-3.c: New test.
	* gcc.dg/pr63567-4.c: New test.

From-SVN: r216440
---

diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index 35b8dcd968e..397bf285fed 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,10 @@
+2014-10-19  Marek Polacek  <polacek@redhat.com>
+
+	PR c/63567
+	* c-typeck.c (output_init_element): Allow initializing objects with
+	static storage duration with compound literals even in C99 and add
+	pedwarn for it.
+
 2014-10-17  Marek Polacek  <polacek@redhat.com>
 
 	PR c/63567
diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c
index 0dd33668d29..ee874daf758 100644
--- a/gcc/c/c-typeck.c
+++ b/gcc/c/c-typeck.c
@@ -8251,11 +8251,14 @@ output_init_element (location_t loc, tree value, tree origtype,
     value = array_to_pointer_conversion (input_location, value);
 
   if (TREE_CODE (value) == COMPOUND_LITERAL_EXPR
-      && require_constant_value && !flag_isoc99 && pending)
+      && require_constant_value && pending)
     {
       /* As an extension, allow initializing objects with static storage
 	 duration with compound literals (which are then treated just as
 	 the brace enclosed list they contain).  */
+      if (flag_isoc99)
+	pedwarn_init (loc, OPT_Wpedantic, "initializer element is not "
+		      "constant");
       tree decl = COMPOUND_LITERAL_EXPR_DECL (value);
       value = DECL_INITIAL (decl);
     }
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 88b321b07c9..b5c8fb78cd1 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2014-10-19  Marek Polacek  <polacek@redhat.com>
+
+	PR c/63567
+	* gcc.dg/pr63567-3.c: New test.
+	* gcc.dg/pr63567-4.c: New test.
+
 2014-10-19  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 
 	* gcc.dg/atomic/c11-atomic-exec-5.c
diff --git a/gcc/testsuite/gcc.dg/pr63567-3.c b/gcc/testsuite/gcc.dg/pr63567-3.c
new file mode 100644
index 00000000000..d62640677b0
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr63567-3.c
@@ -0,0 +1,7 @@
+/* PR c/63567 */
+/* { dg-do compile } */
+/* { dg-options "" } */
+
+struct T { int i; };
+struct S { struct T t; };
+struct S s = { .t = { (int) { 1 } } };
diff --git a/gcc/testsuite/gcc.dg/pr63567-4.c b/gcc/testsuite/gcc.dg/pr63567-4.c
new file mode 100644
index 00000000000..0ca6c45cc23
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr63567-4.c
@@ -0,0 +1,7 @@
+/* PR c/63567 */
+/* { dg-do compile } */
+/* { dg-options "-Wpedantic" } */
+
+struct T { int i; };
+struct S { struct T t; };
+struct S s = { .t = { (int) { 1 } } }; /* { dg-warning "initializer element is not constant" } */