This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Fix PR middle-end/22455
- From: Daniel Berlin <dberlin at dberlin dot org>
- To: GCC Patches <gcc-patches at gcc dot gnu dot org>
- Date: Sun, 21 Aug 2005 22:11:50 -0400
- Subject: Fix PR middle-end/22455
This fixes the fold checksum failure/regression by making it only
checksum the right size.
It also increases the buffer size to account for the fact that
function_decl is larger than non_decl_common.
Bootstrapped and regtested on i686-pc-linux-gnu. I didn't bootstrap
entirely with fold-checksumming on, as it takes too long. I did run a
bunch of files through it.
Okay for mainline?
--Dan
2005-08-21 Daniel Berlin <dberlin@dberlin.org>
Fix PR middle-end/22455
* fold-const.c (fold_checksum_tree): Adjust for now-largest tree size.
Checksum only the parts of the tree that exist for the tree code.
Index: fold-const.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/fold-const.c,v
retrieving revision 1.621
diff -u -p -r1.621 fold-const.c
--- fold-const.c 17 Aug 2005 04:00:21 -0000 1.621
+++ fold-const.c 22 Aug 2005 02:05:36 -0000
@@ -10277,14 +10277,14 @@ fold_checksum_tree (tree expr, struct md
{
void **slot;
enum tree_code code;
- char buf[sizeof (struct tree_decl_non_common)];
+ char buf[sizeof (struct tree_function_decl)];
int i, len;
recursive_label:
gcc_assert ((sizeof (struct tree_exp) + 5 * sizeof (tree)
- <= sizeof (struct tree_decl_non_common))
- && sizeof (struct tree_type) <= sizeof (struct tree_decl_non_common));
+ <= sizeof (struct tree_function_decl))
+ && sizeof (struct tree_type) <= sizeof (struct tree_function_decl));
if (expr == NULL)
return;
slot = htab_find_slot (ht, expr, INSERT);
@@ -10375,13 +10375,18 @@ recursive_label:
fold_checksum_tree (DECL_SIZE_UNIT (expr), ctx, ht);
fold_checksum_tree (DECL_NAME (expr), ctx, ht);
fold_checksum_tree (DECL_CONTEXT (expr), ctx, ht);
- fold_checksum_tree (DECL_ARGUMENTS (expr), ctx, ht);
- fold_checksum_tree (DECL_RESULT_FLD (expr), ctx, ht);
fold_checksum_tree (DECL_INITIAL (expr), ctx, ht);
fold_checksum_tree (DECL_ABSTRACT_ORIGIN (expr), ctx, ht);
- fold_checksum_tree (DECL_SECTION_NAME (expr), ctx, ht);
fold_checksum_tree (DECL_ATTRIBUTES (expr), ctx, ht);
- fold_checksum_tree (DECL_VINDEX (expr), ctx, ht);
+ if (CODE_CONTAINS_STRUCT (TREE_CODE (expr), TS_DECL_WITH_VIS))
+ fold_checksum_tree (DECL_SECTION_NAME (expr), ctx, ht);
+
+ if (CODE_CONTAINS_STRUCT (TREE_CODE (expr), TS_DECL_NON_COMMON))
+ {
+ fold_checksum_tree (DECL_VINDEX (expr), ctx, ht);
+ fold_checksum_tree (DECL_RESULT_FLD (expr), ctx, ht);
+ fold_checksum_tree (DECL_ARGUMENT_FLD (expr), ctx, ht);
+ }
break;
case tcc_type:
if (TREE_CODE (expr) == ENUMERAL_TYPE)