From 21c43754a62409319cb9b16d11aadab4f17cff26 Mon Sep 17 00:00:00 2001 From: Roger Sayle Date: Mon, 16 Jun 2003 12:42:48 +0000 Subject: [PATCH] fold-const.c (operand_equal_p): Consider two calls to "const" functions with identical non-volatile arguments... * fold-const.c (operand_equal_p): Consider two calls to "const" functions with identical non-volatile arguments to be equal. Consider the FUNCTION_DECL for the "__builtin_foo" form of a built-in function to be equal to the "foo" form. Co-Authored-By: Jeff Law From-SVN: r68011 --- gcc/ChangeLog | 8 ++++++++ gcc/fold-const.c | 46 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 13b971f2295..2501744a738 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2003-06-16 Roger Sayle + Jeff Law + + * fold-const.c (operand_equal_p): Consider two calls to "const" + functions with identical non-volatile arguments to be equal. + Consider the FUNCTION_DECL for the "__builtin_foo" form of a + built-in function to be equal to the "foo" form. + 2003-06-16 Nathanael Nerode * config/rs6000/sysv4le.h: Remove target-independent comment. diff --git a/gcc/fold-const.c b/gcc/fold-const.c index bdc84de96f2..0e53f4152ba 100644 --- a/gcc/fold-const.c +++ b/gcc/fold-const.c @@ -1968,8 +1968,8 @@ operand_equal_p (arg0, arg1, only_const) TREE_OPERAND (arg1, 0), 0)); case 'r': - /* If either of the pointer (or reference) expressions we are dereferencing - contain a side effect, these cannot be equal. */ + /* If either of the pointer (or reference) expressions we are + dereferencing contain a side effect, these cannot be equal. */ if (TREE_SIDE_EFFECTS (arg0) || TREE_SIDE_EFFECTS (arg1)) return 0; @@ -2010,10 +2010,52 @@ operand_equal_p (arg0, arg1, only_const) case RTL_EXPR: return rtx_equal_p (RTL_EXPR_RTL (arg0), RTL_EXPR_RTL (arg1)); + case CALL_EXPR: + /* If the CALL_EXPRs call different functions, then they + clearly can not be equal. */ + if (! operand_equal_p (TREE_OPERAND (arg0, 0), + TREE_OPERAND (arg1, 0), 0)) + return 0; + + /* Only consider const functions equivalent. */ + if (TREE_CODE (TREE_OPERAND (arg0, 0)) == ADDR_EXPR) + { + tree fndecl = TREE_OPERAND (TREE_OPERAND (arg0, 0), 0); + if (! (flags_from_decl_or_type (fndecl) & ECF_CONST)) + return 0; + } + else + return 0; + + /* Now see if all the arguments are the same. operand_equal_p + does not handle TREE_LIST, so we walk the operands here + feeding them to operand_equal_p. */ + arg0 = TREE_OPERAND (arg0, 1); + arg1 = TREE_OPERAND (arg1, 1); + while (arg0 && arg1) + { + if (! operand_equal_p (TREE_VALUE (arg0), TREE_VALUE (arg1), 0)) + return 0; + + arg0 = TREE_CHAIN (arg0); + arg1 = TREE_CHAIN (arg1); + } + + /* If we get here and both argument lists are exhausted + then the CALL_EXPRs are equal. */ + return ! (arg0 || arg1); + default: return 0; } + case 'd': + /* Consider __builtin_sqrt equal to sqrt. */ + return TREE_CODE (arg0) == FUNCTION_DECL + && DECL_BUILT_IN (arg0) && DECL_BUILT_IN (arg1) + && DECL_BUILT_IN_CLASS (arg0) == DECL_BUILT_IN_CLASS (arg1) + && DECL_FUNCTION_CODE (arg0) == DECL_FUNCTION_CODE (arg1); + default: return 0; } -- 2.30.2