From 020510c955a775c8b9d1144ec0d16ca6a8efab9a Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Fri, 9 Jul 2004 19:24:27 -0700 Subject: [PATCH] tree-ssa-ccp.c (ccp_fold_builtin): Strip conversion exprs with prejudice. * tree-ssa-ccp.c (ccp_fold_builtin): Strip conversion exprs with prejudice. From-SVN: r84436 --- gcc/ChangeLog | 3 +++ gcc/tree-ssa-ccp.c | 11 ++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3fb67e77a89..47ada40da06 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -2,6 +2,9 @@ * builtins.c (expand_builtin_stpcpy): Don't modify len. + * tree-ssa-ccp.c (ccp_fold_builtin): Strip conversion exprs + with prejudice. + 2004-07-10 Kelley Cook * flags.h: Delete redundant prototypes that are being generated diff --git a/gcc/tree-ssa-ccp.c b/gcc/tree-ssa-ccp.c index d2c503d6ceb..01da8f88e07 100644 --- a/gcc/tree-ssa-ccp.c +++ b/gcc/tree-ssa-ccp.c @@ -2405,7 +2405,16 @@ ccp_fold_builtin (tree stmt, tree fn) } if (result && ignore) - STRIP_NOPS (result); + { + /* STRIP_NOPS isn't strong enough -- it'll stop when we change modes, + but given that we're ignoring the result, we don't care what type + is being returned by the transformed function. */ + while (TREE_CODE (result) == NOP_EXPR + || TREE_CODE (result) == CONVERT_EXPR + || TREE_CODE (result) == NON_LVALUE_EXPR) + result = TREE_OPERAND (result, 0); + } + return result; }