2007-11-16 Richard Guenther <rguenther@suse.de>

	PR tree-optimization/34113
	* tree-ssa-forwprop.c (tree_ssa_forward_propagate_single_use_vars):
	Use correct conversion direction for checking type compatibility.

	* gcc.c-torture/compile/pr34113.c: New testcase.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@130223 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 80dac9c..2dc4553 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2007-11-16  Richard Guenther  <rguenther@suse.de>
 
+       PR tree-optimization/34113
+       * tree-ssa-forwprop.c (tree_ssa_forward_propagate_single_use_vars):
+       Use correct conversion direction for checking type compatibility.
+
+2007-11-16  Richard Guenther  <rguenther@suse.de>
+
        PR tree-optimization/34099
        * tree-ssa-ccp.c (likely_value): Use a whitelist for operators
        that produce UNDEFINED result if at least one of its operands

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9c84667..46fd19a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2007-11-16  Richard Guenther  <rguenther@suse.de>
 
+       PR tree-optimization/34113
+       * gcc.c-torture/compile/pr34113.c: New testcase.
+
+2007-11-16  Richard Guenther  <rguenther@suse.de>
+
        PR tree-optimization/34099
        * g++.dg/torture/pr3499.C: New testcase.
        * gcc.c-torture/execute/pr34099.c: Likewise.

diff --git a/gcc/testsuite/gcc.c-torture/compile/pr34113.c b/gcc/testsuite/gcc.c-torture/compile/pr34113.c
new file mode 100644 (file)
index 0000000..7694b82
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr34113.c
@@ -0,0 +1,11 @@
+struct sockaddr_in { int sin_addr; };
+static void ConvertAddr (struct sockaddr_in *saddr, void **addr)
+{
+  *addr = (void *) &saddr->sin_addr;
+}
+unsigned char EnableLocalHost (struct sockaddr_in *ifa_addr)
+{
+  unsigned char * addr;
+  ConvertAddr(ifa_addr, (void **)&addr);
+  return addr[0];
+}

diff --git a/gcc/tree-ssa-forwprop.c b/gcc/tree-ssa-forwprop.c
index bacd34e..661d3d2 100644 (file)
--- a/gcc/tree-ssa-forwprop.c
+++ b/gcc/tree-ssa-forwprop.c
@@ -959,8 +959,8 @@ tree_ssa_forward_propagate_single_use_vars (void)
                       || TREE_CODE (rhs) == CONVERT_EXPR)
                      && TREE_CODE (TREE_OPERAND (rhs, 0)) == ADDR_EXPR
                      && POINTER_TYPE_P (TREE_TYPE (rhs))
-                     && useless_type_conversion_p (TREE_TYPE (TREE_TYPE (rhs)),
-                                                   TREE_TYPE (TREE_TYPE (TREE_OPERAND (rhs, 0))))))
+                     && useless_type_conversion_p (TREE_TYPE (TREE_TYPE (TREE_OPERAND (rhs, 0))),
+                                                   TREE_TYPE (TREE_TYPE (rhs)))))
                {
                  if (forward_propagate_addr_expr (lhs, rhs))
                    {