From ef78c9c7e6972b818db9c7d50cca1358ab303fdd Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Wed, 19 Sep 2012 11:03:51 +0000 Subject: [PATCH] tree-ssa-forwprop.c (get_prop_source_stmt): Simplify. 2012-09-19 Richard Guenther * tree-ssa-forwprop.c (get_prop_source_stmt): Simplify. From-SVN: r191467 --- gcc/ChangeLog | 4 ++++ gcc/tree-ssa-forwprop.c | 24 +++++------------------- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d00f3e294497..c9d801214eb2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2012-09-19 Richard Guenther + + * tree-ssa-forwprop.c (get_prop_source_stmt): Simplify. + 2012-09-19 Jan Hubicka * symtab.c (insert_to_assembler_name_hash): Do not insert diff --git a/gcc/tree-ssa-forwprop.c b/gcc/tree-ssa-forwprop.c index a1628327a84a..3b7991f8a1db 100644 --- a/gcc/tree-ssa-forwprop.c +++ b/gcc/tree-ssa-forwprop.c @@ -227,29 +227,15 @@ get_prop_source_stmt (tree name, bool single_use_only, bool *single_use_p) if (!is_gimple_assign (def_stmt)) return NULL; - /* If def_stmt is not a simple copy, we possibly found it. */ - if (!gimple_assign_ssa_name_copy_p (def_stmt)) + /* If def_stmt is a simple copy, continue looking. */ + if (gimple_assign_rhs_code (def_stmt) == SSA_NAME) + name = gimple_assign_rhs1 (def_stmt); + else { - tree rhs; - if (!single_use_only && single_use_p) *single_use_p = single_use; - /* We can look through pointer conversions in the search - for a useful stmt for the comparison folding. */ - rhs = gimple_assign_rhs1 (def_stmt); - if (CONVERT_EXPR_CODE_P (gimple_assign_rhs_code (def_stmt)) - && TREE_CODE (rhs) == SSA_NAME - && POINTER_TYPE_P (TREE_TYPE (gimple_assign_lhs (def_stmt))) - && POINTER_TYPE_P (TREE_TYPE (rhs))) - name = rhs; - else - return def_stmt; - } - else - { - /* Continue searching the def of the copy source name. */ - name = gimple_assign_rhs1 (def_stmt); + return def_stmt; } } while (1); }