diff options
Diffstat (limited to 'gcc/convert.c')
| -rw-r--r-- | gcc/convert.c | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/gcc/convert.c b/gcc/convert.c index af97d2a7590..b6c6d0fcf75 100644 --- a/gcc/convert.c +++ b/gcc/convert.c @@ -173,7 +173,7 @@ convert_to_real (tree type, tree expr) CASE_MATHFN (Y1) #undef CASE_MATHFN { - tree arg0 = strip_float_extensions (TREE_VALUE (TREE_OPERAND (expr, 1))); + tree arg0 = strip_float_extensions (CALL_EXPR_ARG (expr, 0)); tree newtype = type; /* We have (outertype)sqrt((innertype)x). Choose the wider mode from @@ -188,13 +188,12 @@ convert_to_real (tree type, tree expr) && (TYPE_MODE (newtype) == TYPE_MODE (double_type_node) || TYPE_MODE (newtype) == TYPE_MODE (float_type_node))) { - tree arglist; tree fn = mathfn_built_in (newtype, fcode); if (fn) { - arglist = build_tree_list (NULL_TREE, fold (convert_to_real (newtype, arg0))); - expr = build_function_call_expr (fn, arglist); + tree arg = fold (convert_to_real (newtype, arg0)); + expr = build_call_expr (fn, 1, arg); if (newtype == type) return expr; } @@ -225,18 +224,14 @@ convert_to_real (tree type, tree expr) if (fn) { - tree arg - = strip_float_extensions (TREE_VALUE (TREE_OPERAND (expr, 1))); + tree arg = strip_float_extensions (CALL_EXPR_ARG (expr, 0)); /* Make sure (type)arg0 is an extension, otherwise we could end up changing (float)floor(double d) into floorf((float)d), which is incorrect because (float)d uses round-to-nearest and can round up to the next integer. */ if (TYPE_PRECISION (type) >= TYPE_PRECISION (TREE_TYPE (arg))) - return - build_function_call_expr (fn, - build_tree_list (NULL_TREE, - fold (convert_to_real (type, arg)))); + return build_call_expr (fn, 1, fold (convert_to_real (type, arg))); } } @@ -434,10 +429,7 @@ convert_to_integer (tree type, tree expr) break; CASE_FLT_FN (BUILT_IN_TRUNC): - { - tree arglist = TREE_OPERAND (s_expr, 1); - return convert_to_integer (type, TREE_VALUE (arglist)); - } + return convert_to_integer (type, CALL_EXPR_ARG (s_expr, 0)); default: break; @@ -445,8 +437,7 @@ convert_to_integer (tree type, tree expr) if (fn) { - tree arglist = TREE_OPERAND (s_expr, 1); - tree newexpr = build_function_call_expr (fn, arglist); + tree newexpr = build_call_expr (fn, 1, CALL_EXPR_ARG (s_expr, 0)); return convert_to_integer (type, newexpr); } } |