diff options
| author | Richard Guenther <rguenther@suse.de> | 2011-05-23 12:03:19 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2011-05-23 12:03:19 +0000 |
| commit | 9a9822e13ece30035ad18fed7f3946d8b1ce67a9 (patch) | |
| tree | 241dd31d7e58e6afc1ee9ea44f993a5ea97c9b9c /gcc/builtins.c | |
| parent | c80286502f7db28d9ef38bdb613209751667834a (diff) | |
| download | gcc-9a9822e13ece30035ad18fed7f3946d8b1ce67a9.zip gcc-9a9822e13ece30035ad18fed7f3946d8b1ce67a9.tar.gz gcc-9a9822e13ece30035ad18fed7f3946d8b1ce67a9.tar.bz2 | |
re PR tree-optimization/15419 (memcpy pessimization)
2011-05-23 Richard Guenther <rguenther@suse.de>
PR middle-end/15419
* builtins.c (fold_builtin_memory_op): Be less restrictive about
what pointer types we accept for folding.
* gcc.dg/memcpy-3.c: New testcase.
From-SVN: r174065
Diffstat (limited to 'gcc/builtins.c')
| -rw-r--r-- | gcc/builtins.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/gcc/builtins.c b/gcc/builtins.c index bd61f29..a23237d 100644 --- a/gcc/builtins.c +++ b/gcc/builtins.c @@ -8509,6 +8509,9 @@ fold_builtin_memory_op (location_t loc, tree dest, tree src, Perhaps we ought to inherit type from non-VOID argument here? */ STRIP_NOPS (src); STRIP_NOPS (dest); + if (!POINTER_TYPE_P (TREE_TYPE (src)) + || !POINTER_TYPE_P (TREE_TYPE (dest))) + return NULL_TREE; /* As we fold (void *)(p + CST) to (void *)p + CST undo this here. */ if (TREE_CODE (src) == POINTER_PLUS_EXPR) { @@ -8525,8 +8528,7 @@ fold_builtin_memory_op (location_t loc, tree dest, tree src, dest = build1 (NOP_EXPR, TREE_TYPE (tem), dest); } srctype = TREE_TYPE (TREE_TYPE (src)); - if (srctype - && TREE_CODE (srctype) == ARRAY_TYPE + if (TREE_CODE (srctype) == ARRAY_TYPE && !tree_int_cst_equal (TYPE_SIZE_UNIT (srctype), len)) { srctype = TREE_TYPE (srctype); @@ -8534,21 +8536,15 @@ fold_builtin_memory_op (location_t loc, tree dest, tree src, src = build1 (NOP_EXPR, build_pointer_type (srctype), src); } desttype = TREE_TYPE (TREE_TYPE (dest)); - if (desttype - && TREE_CODE (desttype) == ARRAY_TYPE + if (TREE_CODE (desttype) == ARRAY_TYPE && !tree_int_cst_equal (TYPE_SIZE_UNIT (desttype), len)) { desttype = TREE_TYPE (desttype); STRIP_NOPS (dest); dest = build1 (NOP_EXPR, build_pointer_type (desttype), dest); } - if (!srctype || !desttype - || TREE_ADDRESSABLE (srctype) - || TREE_ADDRESSABLE (desttype) - || !TYPE_SIZE_UNIT (srctype) - || !TYPE_SIZE_UNIT (desttype) - || TREE_CODE (TYPE_SIZE_UNIT (srctype)) != INTEGER_CST - || TREE_CODE (TYPE_SIZE_UNIT (desttype)) != INTEGER_CST) + if (TREE_ADDRESSABLE (srctype) + || TREE_ADDRESSABLE (desttype)) return NULL_TREE; src_align = get_pointer_alignment (src, BIGGEST_ALIGNMENT); |