aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2014-11-15 18:28:51 -0500
committerJason Merrill <jason@gcc.gnu.org>2014-11-15 18:28:51 -0500
commit3952ae1a528b37aacf924ca57c8dd8ec646cf834 (patch)
tree0191c72d523f88b14c584c512353bcc79f559456
parentb8cd39962c5d6dab4cf908ca561e6e90156f241d (diff)
downloadgcc-3952ae1a528b37aacf924ca57c8dd8ec646cf834.zip
gcc-3952ae1a528b37aacf924ca57c8dd8ec646cf834.tar.gz
gcc-3952ae1a528b37aacf924ca57c8dd8ec646cf834.tar.bz2
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
-rw-r--r--gcc/cp/ChangeLog3
-rw-r--r--gcc/cp/constexpr.c5
2 files changed, 5 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 279e91b..8508db1 100644
--- 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 0d45f31..66d356f 100644
--- 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;
}