diff options
| author | Jason Merrill <jason@redhat.com> | 2009-11-10 13:31:22 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2009-11-10 13:31:22 -0500 |
| commit | 1e7999555e9242ef7cfaac396dbc326723684350 (patch) | |
| tree | c7c4eb5e5f506a564703c6c9c55b67d28734a217 /gcc | |
| parent | 58926110dc3efed307b3a9e06fb51fef5e6d4304 (diff) | |
| download | gcc-1e7999555e9242ef7cfaac396dbc326723684350.zip gcc-1e7999555e9242ef7cfaac396dbc326723684350.tar.gz gcc-1e7999555e9242ef7cfaac396dbc326723684350.tar.bz2 | |
* call.c (build_op_delete_call): Tweak error.
From-SVN: r154073
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/call.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/init/placement5.C | 18 |
4 files changed, 30 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 6087ed7..2407446 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,4 +1,6 @@ -2009-11-09 Jason Merrill <jason@redhat.com> +2009-11-10 Jason Merrill <jason@redhat.com> + + * call.c (build_op_delete_call): Tweak error. PR c++/34158 PR c++/36406 @@ -8,6 +10,8 @@ * pt.c (primary_template_instantiation_p): Non-static. * cp-tree.h: Declare it. +2009-11-09 Jason Merrill <jason@redhat.com> + PR c++/41972 * parser.c (cp_parser_template_argument): Accept SCOPE_REF around VAR_DECL. diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 1cd3fc2..efee604f 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -4613,8 +4613,10 @@ build_op_delete_call (enum tree_code code, tree addr, tree size, deallocation function, would have been selected as a match for the allocation function, the program is ill-formed." */ if (non_placement_deallocation_fn_p (fn)) - error ("non-placement deallocation function %qD selected for " - "placement delete", fn); + { + error ("non-placement deallocation function %q+D", fn); + error ("selected for placement delete"); + } } else /* "Any non-placement deallocation function matches a non-placement diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ae1202f..0267ed4 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,4 +1,6 @@ -2009-11-09 Jason Merrill <jason@redhat.com> +2009-11-10 Jason Merrill <jason@redhat.com> + + * g++.dg/init/placement5.C: New. PR c++/34158 * g++.dg/init/placement4.C: New. diff --git a/gcc/testsuite/g++.dg/init/placement5.C b/gcc/testsuite/g++.dg/init/placement5.C new file mode 100644 index 0000000..bb88239 --- /dev/null +++ b/gcc/testsuite/g++.dg/init/placement5.C @@ -0,0 +1,18 @@ +// 5.3.4/19: If the lookup finds the two-parameter form of a usual +// deallocation function (3.7.4.2) and that function, considered as a +// placement deallocation function, would have been selected as a match for +// the allocation function, the program is ill-formed. + +typedef __SIZE_TYPE__ size_t; + +struct A +{ + A(); + static void* operator new (size_t, size_t); + static void operator delete (void *, size_t); // { dg-error "non-placement" } +}; + +int main() +{ + A* ap = new (24) A; // { dg-error "placement delete" } +} |