diff options
author | James A. Morrison <phython@gcc.gnu.org> | 2005-09-18 19:10:15 +0000 |
---|---|---|
committer | James A. Morrison <phython@gcc.gnu.org> | 2005-09-18 19:10:15 +0000 |
commit | c298ec4e20cdb97f611f92920c7b7ac2a21820e4 (patch) | |
tree | 7a0442d15d00052dffd5178ca24bfb40f1386122 /gcc/java/builtins.c | |
parent | 2c05c0dad5f65ca5e17cfd16429d686fada2221c (diff) | |
download | gcc-c298ec4e20cdb97f611f92920c7b7ac2a21820e4.zip gcc-c298ec4e20cdb97f611f92920c7b7ac2a21820e4.tar.gz gcc-c298ec4e20cdb97f611f92920c7b7ac2a21820e4.tar.bz2 |
builtins.c (max_builtin, [...]): Use fold_buildN.
2005-09-18 James A. Morrison <phython@gcc.gnu.org>
* builtins.c (max_builtin, min_builtin, abs_builtin,
java_build_function_call_expr): Use fold_buildN.
* class.c (layout_class_method): Likewise.
* expr.c (java_truthvalue_conversion, build_java_jsr,
build_java_arrayaccess, expand_java_arrayload, expand_iinc,
build_java_binop, build_field_ref, expand_compare,
build_known_method_ref, build_invokevirtual,
process_jvm_instruction): Likewise.
* parse.y (patch_binop, patch_exit_expr): Likewise.
* typeck.c (convert_ieee_real_to_integer): Likewise.
(convert): Don't call fold after convert_ieee_real_to_integer.
From-SVN: r104407
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); } |