call.c (extend_ref_init_temps_1): Recompute TREE_CONSTANT for the ADDR_EXPR.

	* call.c (extend_ref_init_temps_1): Recompute TREE_CONSTANT for
	the ADDR_EXPR.

From-SVN: r193726

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index edcc81f499e65d3517d177b1f87a91db4c8f5c6f..53fe814d348ed5ca08801f2588418e07db68e89a 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-22  Jason Merrill  <jason@redhat.com>
+
+       * call.c (extend_ref_init_temps_1): Recompute TREE_CONSTANT for
+       the ADDR_EXPR.
+
 2012-11-20  Diego Novillo  <dnovillo@google.com>
            Jakub Jelinek  <jakub@redhat.com>
 

diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 35a3f919997653d9156f17e74bee6eb937391e96..bba5d9fdba542f2d23f670b76e38d79ac8814d59 100644 (file)
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -9188,6 +9188,7 @@ extend_ref_init_temps_1 (tree decl, tree init, vec<tree, va_gc> **cleanups)
       *p = set_up_extended_ref_temp (decl, *p, cleanups, &subinit);
       if (subinit)
        init = build2 (COMPOUND_EXPR, TREE_TYPE (init), subinit, init);
+      recompute_tree_invariant_for_addr_expr (sub);
     }
   return init;
 }