tree-ssa-ccp.c (valueize_op_1): Always allow valueizing default-defs.

2015-02-02  Richard Biener  <rguenther@suse.de>

	* tree-ssa-ccp.c (valueize_op_1): Always allow valueizing default-defs.
	* tree-vrp.c (vrp_valueize_1): Likewise.

From-SVN: r220346

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6453686a233ca7301d7796a7bc534c5be47ca9ba..fc4ecb38e2eecf90c0601185a9ab178807462757 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-02  Richard Biener  <rguenther@suse.de>
+
+       * tree-ssa-ccp.c (valueize_op_1): Always allow valueizing default-defs.
+       * tree-vrp.c (vrp_valueize_1): Likewise.
+
 2015-02-02  Alan Modra  <amodra@gmail.com>
 
        * config/rs6000/rs6000.c (rs6000_call_aix): Use unspec rather

diff --git a/gcc/tree-ssa-ccp.c b/gcc/tree-ssa-ccp.c
index a576bd118b34e44712c8f49d59965390c5f7013a..d45a3ff2a83ca85f2587cbbf4be954ec4a0bf343 100644 (file)
--- a/gcc/tree-ssa-ccp.c
+++ b/gcc/tree-ssa-ccp.c
@@ -1145,7 +1145,8 @@ valueize_op_1 (tree op)
          this SSA edge as the SSA propagator does not necessarily
         re-visit the use.  */
       gimple def_stmt = SSA_NAME_DEF_STMT (op);
-      if (prop_simulate_again_p (def_stmt))
+      if (!gimple_nop_p (def_stmt)
+         && prop_simulate_again_p (def_stmt))
        return NULL_TREE;
       tree tem = get_constant_value (op);
       if (tem)

diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c
index ef1c21db973438a02f27956c401d710b315cd280..dad1830e9a1b98e111ea1b5b46fc71efe4cd27ef 100644 (file)
--- a/gcc/tree-vrp.c
+++ b/gcc/tree-vrp.c
@@ -7096,7 +7096,8 @@ vrp_valueize_1 (tree name)
          this SSA edge as the SSA propagator does not necessarily
         re-visit the use.  */
       gimple def_stmt = SSA_NAME_DEF_STMT (name);
-      if (prop_simulate_again_p (def_stmt))
+      if (!gimple_nop_p (def_stmt)
+         && prop_simulate_again_p (def_stmt))
        return NULL_TREE;
       value_range_t *vr = get_value_range (name);
       if (range_int_cst_singleton_p (vr))