From 8c493ead6366b552adee796de296936b78f34c5a Mon Sep 17 00:00:00 2001
From: Ben Cheng <bccheng@google.com>
Date: Sat, 17 May 2014 17:03:43 -0700
Subject: [4.9] Refresh GCC 4.9 to the 20140514 snapshot.

For critical bug fixes including devirtualization and codegen.

Change-Id: I8138d3dc408fc12db5eecb01d2753d39219712f2
---
 gcc-4.9/gcc/cp/typeck2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gcc-4.9/gcc/cp/typeck2.c')

diff --git a/gcc-4.9/gcc/cp/typeck2.c b/gcc-4.9/gcc/cp/typeck2.c
index 68e518a5c..85696f6e0 100644
--- a/gcc-4.9/gcc/cp/typeck2.c
+++ b/gcc-4.9/gcc/cp/typeck2.c
@@ -1138,7 +1138,7 @@ massage_init_elt (tree type, tree init, tsubst_flags_t complain)
   /* When we defer constant folding within a statement, we may want to
      defer this folding as well.  */
   tree t = fold_non_dependent_expr_sfinae (init, complain);
-  t = maybe_constant_value (t);
+  t = maybe_constant_init (t);
   if (TREE_CONSTANT (t))
     init = t;
   return init;
-- 
cgit v1.2.3