gimplify.c (gimplify_init_constructor): Do not create a temporary for a volatile...

	* gimplify.c (gimplify_init_constructor): Do not create a temporary for
	a volatile LHS if the constructor has only one element.

From-SVN: r163727

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ca67d7fc74f918c7edae6701cb5a081eded82cc4..fd03ae7f51802e5907b29ababf9ec40ef5c03a91 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,11 +1,16 @@
+2010-09-01  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * gimplify.c (gimplify_init_constructor): Do not create a temporary for
+       a volatile LHS if the constructor has only one element.
+
 2010-09-01  Mikael Pettersson  <mikpe@it.uu.se>
 
-       PR bootstrap/45321
-       * tree.c (stdarg_p): Make fntype parameter const.
-       * tree.h (stdarg_p): Likewise.
-       (function_args_iterator): Remove unused fntype field.
-       (function_args_iter_init): Do not initialize fntype
-       field.  Make fntype parameter const. 
+       PR bootstrap/45321
+       * tree.c (stdarg_p): Make fntype parameter const.
+       * tree.h (stdarg_p): Likewise.
+       (function_args_iterator): Remove unused fntype field.
+       (function_args_iter_init): Do not initialize fntype
+       field.  Make fntype parameter const. 
 
 2010-09-01  Richard Guenther  <rguenther@suse.de>
 

diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 52d83f656fb562d9054b7c54ea82eb8a47b30867..b0468c6856bd5d4cc569d463571ea0bd969cac73 100644 (file)
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -3824,11 +3824,12 @@ gimplify_init_constructor (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p,
              }
          }
 
-       /* If the target is volatile and we have non-zero elements
-          initialize the target from a temporary.  */
+       /* If the target is volatile, we have non-zero elements and more than
+          one field to assign, initialize the target from a temporary.  */
        if (TREE_THIS_VOLATILE (object)
            && !TREE_ADDRESSABLE (type)
-           && num_nonzero_elements > 0)
+           && num_nonzero_elements > 0
+           && VEC_length (constructor_elt, elts) > 1)
          {
            tree temp = create_tmp_var (TYPE_MAIN_VARIANT (type), NULL);
            TREE_OPERAND (*expr_p, 0) = temp;