* 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 4cff25833a7445d70b3595a0b630f6236721eb9d..377780ae3adb53474c4c672a973038ad6de34883 100644 (file)
--- 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 51d590ea566e1f6832f5ae06ea6da68ffd774a3b..ac150cedd64c56caee1e209fb4e18e183070a0f9 100644 (file)
--- 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