semantics.c (finish_compound_lteral): Don't wrap VECTOR_TYPEs in a TARGET_EXPR.

	* semantics.c (finish_compound_lteral): Don't wrap VECTOR_TYPEs in a
	TARGET_EXPR.

From-SVN: r235288

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 73b1cfa21a0e2ed4955d2d4bf34708ced2f98019..008bc355b03b2fcdc752a1e9b96f3f698799e5cb 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2016-04-20  Nathan Sidwell  <nathan@acm.org>
+
+       * semantics.c (finish_compound_lteral): Don't wrap VECTOR_TYPEs in a
+       TARGET_EXPR.
+
 2016-04-19  Jason Merrill  <jason@redhat.com>
 
        PR c++/66543

diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 85ef9934e96f53908085ca2143377ae9fd20fcb2..1dff08e29d912690c3c95b5a309e4a219b144874 100644 (file)
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -2732,8 +2732,8 @@ finish_compound_literal (tree type, tree compound_literal,
   compound_literal = digest_init (type, compound_literal, complain);
   if (TREE_CODE (compound_literal) == CONSTRUCTOR)
     TREE_HAS_CONSTRUCTOR (compound_literal) = true;
-  /* Put static/constant array temporaries in static variables, but always
-     represent class temporaries with TARGET_EXPR so we elide copies.  */
+
+  /* Put static/constant array temporaries in static variables.  */
   if ((!at_function_scope_p () || CP_TYPE_CONST_P (type))
       && TREE_CODE (type) == ARRAY_TYPE
       && !TYPE_HAS_NONTRIVIAL_DESTRUCTOR (type)
@@ -2763,8 +2763,13 @@ finish_compound_literal (tree type, tree compound_literal,
        return error_mark_node;
       return decl;
     }
-  else
-    return get_target_expr_sfinae (compound_literal, complain);
+
+  /* Represent other compound literals with TARGET_EXPR so we produce
+     an lvalue, but can elide copies.  */
+  if (!VECTOR_TYPE_P (type))
+    compound_literal = get_target_expr_sfinae (compound_literal, complain);
+
+  return compound_literal;
 }
 
 /* Return the declaration for the function-name variable indicated by