constexpr.c (cxx_eval_builtin_function_call): Use fold_builtin_call_array.

	* constexpr.c (cxx_eval_builtin_function_call): Use
	fold_builtin_call_array.

From-SVN: r217617

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 279e91b92f05c57252fa5b971072beae1d899b48..8508db1047ea47eceac90dc4d0550ae9fa22ddb5 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2014-11-15  Jason Merrill  <jason@redhat.com>
 
+       * constexpr.c (cxx_eval_builtin_function_call): Use
+       fold_builtin_call_array.
+
        * constexpr.c (cx_check_missing_mem_inits): Clarify error message.
 
 2014-11-14  Paolo Carlini  <paolo.carlini@oracle.com>

diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index 0d45f31f48acbe30dd76c7b8bcc00afd2cc598ad..66d356f2416aaf8f3a874857f99a5e6f92cc20ae 100644 (file)
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -995,9 +995,8 @@ cxx_eval_builtin_function_call (const constexpr_ctx *ctx, tree t,
     }
   if (*non_constant_p)
     return t;
-  new_call = build_call_array_loc (EXPR_LOCATION (t), TREE_TYPE (t),
-                                   CALL_EXPR_FN (t), nargs, args);
-  new_call = fold (new_call);
+  new_call = fold_builtin_call_array (EXPR_LOCATION (t), TREE_TYPE (t),
+                                     CALL_EXPR_FN (t), nargs, args);
   VERIFY_CONSTANT (new_call);
   return new_call;
 }