2005-07-01 Andrew Pinski <pinskia@physics.uc.edu>

        PR tree-opt/22269
        * tree-ssa-reassoc.c (should_transpose): Fix which operand
        we check for SSA_NAME for.

2005-07-01  Andrew Pinski  <pinskia@physics.uc.edu>

        PR tree-opt/22269
        * gcc.c-torture/compile/pr22269.c: New test.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 70be419..8236a2f 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-01  Andrew Pinski  <pinskia@physics.uc.edu>
+
+       PR tree-opt/22269
+       * tree-ssa-reassoc.c (should_transpose): Fix which operand
+       we check for SSA_NAME for.
+
 2005-06-29  Daniel Berlin  <dberlin@dberlin.org>
 
        Fix PR tree-optimization/22071

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 47001d3..32ef7e1 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-01  Andrew Pinski  <pinskia@physics.uc.edu>
+
+       PR tree-opt/22269
+       * gcc.c-torture/compile/pr22269.c: New test.
+
 2005-06-30  Diego Novillo  <dnovillo@redhat.com>
 
        PR 21584

diff --git a/gcc/testsuite/gcc.c-torture/compile/pr22269.c b/gcc/testsuite/gcc.c-torture/compile/pr22269.c
new file mode 100644 (file)
index 0000000..bfcf209
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr22269.c
@@ -0,0 +1,16 @@
+/* We used to ICE in tree-ssa-reassoc because we did look at the correct operand to
+   see if it was a SSA_NAME.  */
+int printf(const char*, ...);
+int main(int argv, char*argc) {
+
+    int d1;
+    int d2;
+    int s1, s2;
+    int b;
+    ((d1)&=(int)0x0000ffffL, (d1)|=((int)(short)(0x344))<<16);
+    ((d1)&=(int)0xffff0000UL, (d1)|=(int)(unsigned short)(0x4567));
+    ((d2)&=(int)0x0000ffffL, (d2)|=((int)(short)(0))<<16);
+    ((d2)&=(int)0xffff0000UL, (d2)|=(int)(unsigned short)(0x3b9a));
+    printf(" dividend >>: %ld\n", d1);
+    printf(" divisor  >>: %ld\n", d2);
+}

diff --git a/gcc/tree-ssa-reassoc.c b/gcc/tree-ssa-reassoc.c
index 5f0e8fc..395c549 100644 (file)
--- a/gcc/tree-ssa-reassoc.c
+++ b/gcc/tree-ssa-reassoc.c
@@ -406,7 +406,7 @@ should_transpose (tree rhs ATTRIBUTE_UNUSED,
 
   /* Also, see if the LHS's high ranked op should be switched with our
      RHS simply because it is greater in rank than our current RHS.  */
-  if (TREE_CODE (TREE_OPERAND (lhsdefop, 0)) == SSA_NAME)
+  if (TREE_CODE (TREE_OPERAND (lhsdefop, highrankop)) == SSA_NAME)
     {
       tree iop = SSA_NAME_DEF_STMT (TREE_OPERAND (lhsdefop, highrankop));
       if (TREE_CODE (iop) == MODIFY_EXPR)