diff options
| author | Alexandre Oliva <aoliva@redhat.com> | 2010-09-08 21:53:48 +0000 |
|---|---|---|
| committer | Alexandre Oliva <aoliva@gcc.gnu.org> | 2010-09-08 21:53:48 +0000 |
| commit | 359bea1da45819206bf0a9132362ee6e0f181282 (patch) | |
| tree | 51a704702b2ef87537d068e5ea5a55d72cb03512 /gcc | |
| parent | 0a7822a32b830084f37e78545047ce0d4e5cd486 (diff) | |
| download | gcc-359bea1da45819206bf0a9132362ee6e0f181282.zip gcc-359bea1da45819206bf0a9132362ee6e0f181282.tar.gz gcc-359bea1da45819206bf0a9132362ee6e0f181282.tar.bz2 | |
re PR debug/45419 (-fcompare-debug failure at -O3)
PR debug/45419
PR debug/45408
* tree-pretty-print.c (dump_generic_node): Disregard top-level
qualifiers in otherwise equal MEM_REF pointer types.
* fold-const.c (operand_equal_p): Compare pointer type of MEM_REFs.
* tree.c (iterative_hash_expr): Hash the pointer type of MEM_REFs.
From-SVN: r164031
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/fold-const.c | 9 | ||||
| -rw-r--r-- | gcc/tree-pretty-print.c | 13 | ||||
| -rw-r--r-- | gcc/tree.c | 15 |
4 files changed, 38 insertions, 8 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c121a35..e02f98f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2010-09-08 Alexandre Oliva <aoliva@redhat.com> + + PR debug/45419 + PR debug/45408 + * tree-pretty-print.c (dump_generic_node): Disregard top-level + qualifiers in otherwise equal MEM_REF pointer types. + * fold-const.c (operand_equal_p): Compare pointer type of MEM_REFs. + * tree.c (iterative_hash_expr): Hash the pointer type of MEM_REFs. + 2010-09-08 Ramana Radhakrishnan <ramana.radhakrishnan@arm.com> PR target/44392 diff --git a/gcc/fold-const.c b/gcc/fold-const.c index baac13f..c941703 100644 --- a/gcc/fold-const.c +++ b/gcc/fold-const.c @@ -2591,14 +2591,17 @@ operand_equal_p (const_tree arg0, const_tree arg1, unsigned int flags) return OP_SAME (0); case MEM_REF: - /* Require equal access sizes. We can have incomplete types - for array references of variable-sized arrays from the - Fortran frontent though. */ + /* Require equal access sizes, and similar pointer types. + We can have incomplete types for array references of + variable-sized arrays from the Fortran frontent + though. */ return ((TYPE_SIZE (TREE_TYPE (arg0)) == TYPE_SIZE (TREE_TYPE (arg1)) || (TYPE_SIZE (TREE_TYPE (arg0)) && TYPE_SIZE (TREE_TYPE (arg1)) && operand_equal_p (TYPE_SIZE (TREE_TYPE (arg0)), TYPE_SIZE (TREE_TYPE (arg1)), flags))) + && (TYPE_MAIN_VARIANT (TREE_TYPE (TREE_OPERAND (arg0, 1))) + == TYPE_MAIN_VARIANT (TREE_TYPE (TREE_OPERAND (arg1, 1)))) && OP_SAME (0) && OP_SAME (1)); case ARRAY_REF: diff --git a/gcc/tree-pretty-print.c b/gcc/tree-pretty-print.c index 44edbb0..108a0d1 100644 --- a/gcc/tree-pretty-print.c +++ b/gcc/tree-pretty-print.c @@ -809,8 +809,8 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags, == TYPE_MODE (TREE_TYPE (TREE_OPERAND (node, 1)))) && (TYPE_REF_CAN_ALIAS_ALL (TREE_TYPE (TREE_OPERAND (node, 0))) == TYPE_REF_CAN_ALIAS_ALL (TREE_TYPE (TREE_OPERAND (node, 1)))) - && (TYPE_QUALS (TREE_TYPE (TREE_OPERAND (node, 0))) - == TYPE_QUALS (TREE_TYPE (TREE_OPERAND (node, 1)))) + && (TYPE_MAIN_VARIANT (TREE_TYPE (TREE_OPERAND (node, 0))) + == TYPE_MAIN_VARIANT (TREE_TYPE (TREE_OPERAND (node, 1)))) /* Same value types ignoring qualifiers. */ && (TYPE_MAIN_VARIANT (TREE_TYPE (node)) == TYPE_MAIN_VARIANT @@ -829,9 +829,12 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags, } else { + tree ptype; + pp_string (buffer, "MEM["); pp_string (buffer, "("); - dump_generic_node (buffer, TREE_TYPE (TREE_OPERAND (node, 1)), + ptype = TYPE_MAIN_VARIANT (TREE_TYPE (TREE_OPERAND (node, 1))); + dump_generic_node (buffer, ptype, spc, flags | TDF_SLIM, false); pp_string (buffer, ")"); dump_generic_node (buffer, TREE_OPERAND (node, 0), @@ -1170,8 +1173,8 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags, == TYPE_MODE (TREE_TYPE (TREE_OPERAND (op0, 1)))) && (TYPE_REF_CAN_ALIAS_ALL (TREE_TYPE (TREE_OPERAND (op0, 0))) == TYPE_REF_CAN_ALIAS_ALL (TREE_TYPE (TREE_OPERAND (op0, 1)))) - && (TYPE_QUALS (TREE_TYPE (TREE_OPERAND (op0, 0))) - == TYPE_QUALS (TREE_TYPE (TREE_OPERAND (op0, 1)))) + && (TYPE_MAIN_VARIANT (TREE_TYPE (TREE_OPERAND (op0, 0))) + == TYPE_MAIN_VARIANT (TREE_TYPE (TREE_OPERAND (op0, 1)))) /* Same value types ignoring qualifiers. */ && (TYPE_MAIN_VARIANT (TREE_TYPE (op0)) == TYPE_MAIN_VARIANT @@ -6768,6 +6768,21 @@ iterative_hash_expr (const_tree t, hashval_t val) } return val; } + case MEM_REF: + { + /* The type of the second operand is relevant, except for + its top-level qualifiers. */ + tree type = TYPE_MAIN_VARIANT (TREE_TYPE (TREE_OPERAND (t, 1))); + + val = iterative_hash_object (TYPE_HASH (type), val); + + /* We could use the standard hash computation from this point + on. */ + val = iterative_hash_object (code, val); + val = iterative_hash_expr (TREE_OPERAND (t, 1), val); + val = iterative_hash_expr (TREE_OPERAND (t, 0), val); + return val; + } case FUNCTION_DECL: /* When referring to a built-in FUNCTION_DECL, use the __builtin__ form. Otherwise nodes that compare equal according to operand_equal_p might |