From 3952ae1a528b37aacf924ca57c8dd8ec646cf834 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Sat, 15 Nov 2014 18:28:51 -0500 Subject: [PATCH] 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 --- gcc/cp/ChangeLog | 3 +++ gcc/cp/constexpr.c | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 279e91b92f0..8508db1047e 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2014-11-15 Jason Merrill + * 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 diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index 0d45f31f48a..66d356f2416 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; } -- 2.30.2