On Mon, Oct 26, 2015 at 10:57 AM, Richard Sandiford
<richard.sandif...@arm.com> wrote:
> Just makes an upcoming patch a bit clearer.
>
> Tested on x86_64-linux-gnu, aarch64-linux-gnu and arm-linux-gnueabi.
> OK to install?
Ok.
Thanks,
Richard.
> Thanks,
> Richard
>
>
> gcc/
> * builtins.c (fold_builtin_fma): Remove constant handling.
> (fold_builtin_3): Handle constant fma arguments here.
>
> diff --git a/gcc/builtins.c b/gcc/builtins.c
> index a03dffc..6cd8879 100644
> --- a/gcc/builtins.c
> +++ b/gcc/builtins.c
> @@ -7881,18 +7881,13 @@ fold_fma (location_t loc ATTRIBUTE_UNUSED,
> static tree
> fold_builtin_fma (location_t loc, tree arg0, tree arg1, tree arg2, tree type)
> {
> + /* ??? Only expand to FMA_EXPR if it's directly supported. */
> if (validate_arg (arg0, REAL_TYPE)
> && validate_arg (arg1, REAL_TYPE)
> - && validate_arg (arg2, REAL_TYPE))
> - {
> - tree tem = fold_fma (loc, type, arg0, arg1, arg2);
> - if (tem)
> - return tem;
> + && validate_arg (arg2, REAL_TYPE)
> + && optab_handler (fma_optab, TYPE_MODE (type)) != CODE_FOR_nothing)
> + return fold_build3_loc (loc, FMA_EXPR, type, arg0, arg1, arg2);
>
> - /* ??? Only expand to FMA_EXPR if it's directly supported. */
> - if (optab_handler (fma_optab, TYPE_MODE (type)) != CODE_FOR_nothing)
> - return fold_build3_loc (loc, FMA_EXPR, type, arg0, arg1, arg2);
> - }
> return NULL_TREE;
> }
>
> @@ -9307,8 +9302,9 @@ fold_builtin_3 (location_t loc, tree fndecl,
> return fold_builtin_sincos (loc, arg0, arg1, arg2);
>
> CASE_FLT_FN (BUILT_IN_FMA):
> + if (tree tem = fold_fma (loc, type, arg0, arg1, arg2))
> + return tem;
> return fold_builtin_fma (loc, arg0, arg1, arg2, type);
> - break;
>
> CASE_FLT_FN (BUILT_IN_REMQUO):
> if (validate_arg (arg0, REAL_TYPE)
>
