From c663bc6a4ff37bf6cb3d6d05c9862e17236051ec Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Fri, 18 Apr 2014 14:11:22 -0400 Subject: [PATCH] re PR c++/60872 (Cannot memcpy array of restricted pointers) PR c++/60872 * call.c (standard_conversion): Don't try to apply restrict to void. From-SVN: r209520 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/call.c | 5 +++-- gcc/testsuite/g++.dg/ext/restrict2.C | 8 ++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/ext/restrict2.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e10a227..23baee6 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2014-04-18 Jason Merrill + + PR c++/60872 + * call.c (standard_conversion): Don't try to apply restrict to void. + 2014-04-16 Marc Glisse * decl.c (reshape_init_r): Handle a single element of vector type. diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 7dbe935..fbd2f83 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -1196,9 +1196,10 @@ standard_conversion (tree to, tree from, tree expr, bool c_cast_p, && TREE_CODE (TREE_TYPE (from)) != FUNCTION_TYPE) { tree nfrom = TREE_TYPE (from); + /* Don't try to apply restrict to void. */ + int quals = cp_type_quals (nfrom) & ~TYPE_QUAL_RESTRICT; from = build_pointer_type - (cp_build_qualified_type (void_type_node, - cp_type_quals (nfrom))); + (cp_build_qualified_type (void_type_node, quals)); conv = build_conv (ck_ptr, from, conv); } else if (TYPE_PTRDATAMEM_P (from)) diff --git a/gcc/testsuite/g++.dg/ext/restrict2.C b/gcc/testsuite/g++.dg/ext/restrict2.C new file mode 100644 index 0000000..f053210 --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/restrict2.C @@ -0,0 +1,8 @@ +// PR c++/60872 +// { dg-options "" } + +typedef double *__restrict T; +void f(T* p) +{ + void *p2 = p; +} -- 2.7.4