diff options
Diffstat (limited to 'gcc/java/builtins.c')
| -rw-r--r-- | gcc/java/builtins.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/gcc/java/builtins.c b/gcc/java/builtins.c index 68f0b95..2ea9e57 100644 --- a/gcc/java/builtins.c +++ b/gcc/java/builtins.c @@ -94,24 +94,24 @@ static GTY(()) struct builtin_record java_builtins[] = static tree max_builtin (tree method_return_type, tree method_arguments) { - return fold (build2 (MAX_EXPR, method_return_type, - TREE_VALUE (method_arguments), - TREE_VALUE (TREE_CHAIN (method_arguments)))); + return fold_build2 (MAX_EXPR, method_return_type, + TREE_VALUE (method_arguments), + TREE_VALUE (TREE_CHAIN (method_arguments))); } static tree min_builtin (tree method_return_type, tree method_arguments) { - return fold (build2 (MIN_EXPR, method_return_type, - TREE_VALUE (method_arguments), - TREE_VALUE (TREE_CHAIN (method_arguments)))); + return fold_build2 (MIN_EXPR, method_return_type, + TREE_VALUE (method_arguments), + TREE_VALUE (TREE_CHAIN (method_arguments))); } static tree abs_builtin (tree method_return_type, tree method_arguments) { - return fold (build1 (ABS_EXPR, method_return_type, - TREE_VALUE (method_arguments))); + return fold_build1 (ABS_EXPR, method_return_type, + TREE_VALUE (method_arguments)); } /* Mostly copied from ../builtins.c. */ @@ -121,10 +121,8 @@ java_build_function_call_expr (tree fn, tree arglist) tree call_expr; call_expr = build1 (ADDR_EXPR, build_pointer_type (TREE_TYPE (fn)), fn); - call_expr = build3 (CALL_EXPR, TREE_TYPE (TREE_TYPE (fn)), + return fold_build3 (CALL_EXPR, TREE_TYPE (TREE_TYPE (fn)), call_expr, arglist, NULL_TREE); - TREE_SIDE_EFFECTS (call_expr) = 1; - return fold (call_expr); } |