2005-05-31 Andrew pinski <pinskia@physics.uc.edu>

        PR middle-end/20931
        * g++.dg/opt/pr20931.C: New test.

2005-05-31  Andrew Pinski  <pinskia@physics.uc.edu>

        PR middle-end/20931
        PR middle-end/20946
        * fold-const.c (fold_checksum_tree): Copy types also if
        TYPE_CONTAINS_PLACEHOLDER_INTERNAL is set.
        Don't call fold_checksum_tree for TREE_LIST's TREE_CHAIN
        first.
        Tail recurse TREE_LIST's TREE_CHAIN.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 25cd8c6..f486794 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,15 @@
 2005-05-31  Andrew Pinski  <pinskia@physics.uc.edu>
 
+       PR middle-end/20931
+       PR middle-end/20946
+       * fold-const.c (fold_checksum_tree): Copy types also if
+       TYPE_CONTAINS_PLACEHOLDER_INTERNAL is set.
+       Don't call fold_checksum_tree for TREE_LIST's TREE_CHAIN
+       first.
+       Tail recurse TREE_LIST's TREE_CHAIN.
+
+2005-05-31  Andrew Pinski  <pinskia@physics.uc.edu>
+
        PR tree-opt/21732
        * tree-ssa-copy.c (dump_copy_of): Create a bitmap and don't visit a
        SSA_NAME twice and cause the loop to become finite.  Remove the test

diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index c780659..97caf15 100644 (file)
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -10419,6 +10419,8 @@ fold_checksum_tree (tree expr, struct md5_ctx *ctx, htab_t ht)
   enum tree_code code;
   char buf[sizeof (struct tree_decl)];
   int i, len;
+  
+recursive_label:
 
   gcc_assert ((sizeof (struct tree_exp) + 5 * sizeof (tree)
               <= sizeof (struct tree_decl))
@@ -10440,11 +10442,13 @@ fold_checksum_tree (tree expr, struct md5_ctx *ctx, htab_t ht)
     }
   else if (TREE_CODE_CLASS (code) == tcc_type
           && (TYPE_POINTER_TO (expr) || TYPE_REFERENCE_TO (expr)
-              || TYPE_CACHED_VALUES_P (expr)))
+              || TYPE_CACHED_VALUES_P (expr)
+              || TYPE_CONTAINS_PLACEHOLDER_INTERNAL (expr)))
     {
       /* Allow these fields to be modified.  */
       memcpy (buf, expr, tree_size (expr));
       expr = (tree) buf;
+      TYPE_CONTAINS_PLACEHOLDER_INTERNAL (expr) = 0;
       TYPE_POINTER_TO (expr) = NULL;
       TYPE_REFERENCE_TO (expr) = NULL;
       if (TYPE_CACHED_VALUES_P (expr))
@@ -10456,7 +10460,8 @@ fold_checksum_tree (tree expr, struct md5_ctx *ctx, htab_t ht)
   md5_process_bytes (expr, tree_size (expr), ctx);
   fold_checksum_tree (TREE_TYPE (expr), ctx, ht);
   if (TREE_CODE_CLASS (code) != tcc_type
-      && TREE_CODE_CLASS (code) != tcc_declaration)
+      && TREE_CODE_CLASS (code) != tcc_declaration
+      && code != TREE_LIST)
     fold_checksum_tree (TREE_CHAIN (expr), ctx, ht);
   switch (TREE_CODE_CLASS (code))
     {
@@ -10484,6 +10489,8 @@ fold_checksum_tree (tree expr, struct md5_ctx *ctx, htab_t ht)
        case TREE_LIST:
          fold_checksum_tree (TREE_PURPOSE (expr), ctx, ht);
          fold_checksum_tree (TREE_VALUE (expr), ctx, ht);
+         expr = TREE_CHAIN (expr);
+         goto recursive_label;
          break;
        case TREE_VEC:
          for (i = 0; i < TREE_VEC_LENGTH (expr); ++i)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c5f860a..2b499e9 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-31  Andrew pinski  <pinskia@physics.uc.edu>
+
+       PR middle-end/20931
+       * g++.dg/opt/pr20931.C: New test.
+
 2005-05-31  Andreas Jaeger  <aj@suse.de>
 
        PR testsuite/20772

diff --git a/gcc/testsuite/g++.dg/opt/pr20931.C b/gcc/testsuite/g++.dg/opt/pr20931.C
new file mode 100644 (file)
index 0000000..01518c0
--- /dev/null
+++ b/gcc/testsuite/g++.dg/opt/pr20931.C
@@ -0,0 +1,13 @@
+// PR middle-end
+// This testcase ICEd because fold checking saw a type change which
+// is allowed as TYPE_CONTAINS_PLACEHOLDER_INTERNAL could change.
+// { dg-do compile }
+// { dg-options "-O2" }
+  
+int
+__finite (double __x) throw ()
+{
+  return (__extension__
+   (((((union { double __d; int __i[2]; }) {__d: __x}).__i[1]
+      | 0x800fffffu) + 1) >> 31));
+}