From: Jason Merrill <jason@redhat.com>
Date: Fri, 10 Jun 2011 03:55:48 +0000 (-0400)
Subject: * pt.c (build_non_dependent_expr): Use fold_non_dependent_expr_sfinae.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b82972cae2cbba7f8b85517ae4d10d086c0b5de0;p=gcc.git

* pt.c (build_non_dependent_expr): Use fold_non_dependent_expr_sfinae.

From-SVN: r174883
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 4cff25833a7..377780ae3ad 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,7 @@
 2011-06-09  Jason Merrill  <jason@redhat.com>
 
+	* pt.c (build_non_dependent_expr): Use fold_non_dependent_expr_sfinae.
+
 	* parser.c (cp_parser_constant_expression): Just return the
 	non-constant expression.
 
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 51d590ea566..ac150cedd64 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -19124,7 +19124,7 @@ build_non_dependent_expr (tree expr)
   /* Try to get a constant value for all non-type-dependent expressions in
       order to expose bugs in *_dependent_expression_p and constexpr.  */
   if (cxx_dialect >= cxx0x)
-    maybe_constant_value (fold_non_dependent_expr (expr));
+    maybe_constant_value (fold_non_dependent_expr_sfinae (expr, tf_none));
 #endif
 
   /* Preserve OVERLOADs; the functions must be available to resolve