diff options
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/builtins.c | 12 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/torture/pr38705.C | 27 |
4 files changed, 42 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5980890..5f6b8d1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,10 @@ 2009-01-03 Jakub Jelinek <jakub@redhat.com> + PR c++/38705 + * builtins.c (fold_builtin_memory_op): Give up if either operand + is volatile. Set srctype or desttype to non-qualified version + of the other type. + PR c/38700 * builtins.c (fold_builtin_expect): Only check DECL_WEAK for VAR_DECLs and FUNCTION_DECLs. diff --git a/gcc/builtins.c b/gcc/builtins.c index cda94c3..57cce08 100644 --- a/gcc/builtins.c +++ b/gcc/builtins.c @@ -8907,7 +8907,9 @@ fold_builtin_memory_op (tree dest, tree src, tree len, tree type, bool ignore, i || !TYPE_SIZE_UNIT (srctype) || !TYPE_SIZE_UNIT (desttype) || TREE_CODE (TYPE_SIZE_UNIT (srctype)) != INTEGER_CST - || TREE_CODE (TYPE_SIZE_UNIT (desttype)) != INTEGER_CST) + || TREE_CODE (TYPE_SIZE_UNIT (desttype)) != INTEGER_CST + || TYPE_VOLATILE (srctype) + || TYPE_VOLATILE (desttype)) return NULL_TREE; src_align = get_pointer_alignment (src, BIGGEST_ALIGNMENT); @@ -8924,7 +8926,7 @@ fold_builtin_memory_op (tree dest, tree src, tree len, tree type, bool ignore, i { srcvar = build_fold_indirect_ref (src); if (TREE_THIS_VOLATILE (srcvar)) - srcvar = NULL_TREE; + return NULL_TREE; else if (!tree_int_cst_equal (lang_hooks.expr_size (srcvar), len)) srcvar = NULL_TREE; /* With memcpy, it is possible to bypass aliasing rules, so without @@ -8942,7 +8944,7 @@ fold_builtin_memory_op (tree dest, tree src, tree len, tree type, bool ignore, i { destvar = build_fold_indirect_ref (dest); if (TREE_THIS_VOLATILE (destvar)) - destvar = NULL_TREE; + return NULL_TREE; else if (!tree_int_cst_equal (lang_hooks.expr_size (destvar), len)) destvar = NULL_TREE; else if (!var_decl_component_p (destvar)) @@ -8958,7 +8960,7 @@ fold_builtin_memory_op (tree dest, tree src, tree len, tree type, bool ignore, i if (TREE_ADDRESSABLE (TREE_TYPE (destvar))) return NULL_TREE; - srctype = desttype; + srctype = build_qualified_type (desttype, 0); if (src_align < (int) TYPE_ALIGN (srctype)) { if (AGGREGATE_TYPE_P (srctype) @@ -8980,7 +8982,7 @@ fold_builtin_memory_op (tree dest, tree src, tree len, tree type, bool ignore, i if (TREE_ADDRESSABLE (TREE_TYPE (srcvar))) return NULL_TREE; - desttype = srctype; + desttype = build_qualified_type (srctype, 0); if (dest_align < (int) TYPE_ALIGN (desttype)) { if (AGGREGATE_TYPE_P (desttype) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4a0c0c6..5f1c422 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2009-01-03 Jakub Jelinek <jakub@redhat.com> + PR c++/38705 + * g++.dg/torture/pr38705.C: New test. + PR c/38700 * gcc.dg/pr38700.c: New test. diff --git a/gcc/testsuite/g++.dg/torture/pr38705.C b/gcc/testsuite/g++.dg/torture/pr38705.C new file mode 100644 index 0000000..8058d3a --- /dev/null +++ b/gcc/testsuite/g++.dg/torture/pr38705.C @@ -0,0 +1,27 @@ +// PR c++/38705 +// { dg-do compile } + +typedef int T; +typedef __SIZE_TYPE__ size_t; +extern "C" void *memcpy (void *, const void *, size_t); + +void +foo (char *p, const int q) +{ + memcpy (p, &q, sizeof (int)); +} + +struct S +{ + T t; + int u; + int bar () const; + template <class T> void foo (const T &x) const {} +}; + +int +S::bar () const +{ + foo (u); + foo (t); +} |