From 49d766869a568a5fa928466121d69671902da9c9 Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Wed, 27 Apr 2005 19:39:08 +0000 Subject: [PATCH] fold-const.c (fold_binary): Use build_fold_addr_expr for address calculation and INDIRECT_REF handling. 2005-04-27 Richard Guenther * fold-const.c (fold_binary): Use build_fold_addr_expr for address calculation and INDIRECT_REF handling. From-SVN: r98877 --- gcc/ChangeLog | 5 +++++ gcc/fold-const.c | 18 +++--------------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index af1b5fd1626..4d31978f1bd 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2005-04-27 Richard Guenther + + * fold-const.c (fold_binary): Use build_fold_addr_expr + for address calculation and INDIRECT_REF handling. + 2005-04-27 Andrew Haley * postreload-gcse.c (hash_scan_set): Remove bogus assertion. diff --git a/gcc/fold-const.c b/gcc/fold-const.c index 9de988c2300..9e9243cdaae 100644 --- a/gcc/fold-const.c +++ b/gcc/fold-const.c @@ -9723,21 +9723,9 @@ fold_binary (enum tree_code code, tree type, tree op0, tree op1) { tree op0 = TREE_OPERAND (cref0, 0); tree op1 = TREE_OPERAND (cref1, 0); - if (TREE_CODE (op0) == INDIRECT_REF) - op0 = TREE_OPERAND (op0, 0); - else - { - tree ptype = build_pointer_type (TREE_TYPE (op0)); - op0 = build1 (ADDR_EXPR, ptype, op0); - } - if (TREE_CODE (op1) == INDIRECT_REF) - op1 = TREE_OPERAND (op1, 0); - else - { - tree ptype = build_pointer_type (TREE_TYPE (op1)); - op1 = build1 (ADDR_EXPR, ptype, op1); - } - return fold_build2 (code, type, op0, op1); + return fold_build2 (code, type, + build_fold_addr_expr (op0), + build_fold_addr_expr (op1)); } }