From: Richard Sandiford <rsandifo@redhat.com>
Date: Wed, 23 Jun 2004 09:08:21 +0000 (+0000)
Subject: gengtype-yacc.y (option): Avoid use of non-constant struct initializer.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5d81e3d373876ebbea7ff5133c4762be95be6c30;p=gcc.git

gengtype-yacc.y (option): Avoid use of non-constant struct initializer.

	* gengtype-yacc.y (option): Avoid use of non-constant struct
	initializer.

From-SVN: r83546
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4068b8d23ff..8bcc51ea9cb 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-23  Richard Sandiford  <rsandifo@redhat.com>
+
+	* gengtype-yacc.y (option): Avoid use of non-constant struct
+	initializer.
+
 2004-06-23  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* doc/extend.texi (Function Attributes): Alphabetize.
diff --git a/gcc/gengtype-yacc.y b/gcc/gengtype-yacc.y
index 2e7b6a70575..449a515e083 100644
--- a/gcc/gengtype-yacc.y
+++ b/gcc/gengtype-yacc.y
@@ -282,8 +282,11 @@ option:   ID
 	    { $$ = create_option ($1, adjust_field_type ($3, NULL)); }
 	| NESTED_PTR '(' type ',' stringseq ',' stringseq ')'
 	    {
-	      struct nested_ptr_data d =
-	        { adjust_field_type ($3, NULL), $5, $7 };
+	      struct nested_ptr_data d;
+
+	      d.type = adjust_field_type ($3, NULL);
+	      d.convert_to = $5;
+	      d.convert_from = $7;
 	      $$ = create_option ("nested_ptr",
 				  xmemdup (&d, sizeof (d), sizeof (d)));
 	    }