From 6edee4b3d3a2c970eee897443c9b580ed5d8226b Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Fri, 25 Jan 2019 19:50:55 +0000 Subject: [PATCH] re PR c++/88969 (ICE in build_op_delete_call, at cp/call.c:6509) /cp 2019-01-25 Paolo Carlini PR c++/88969 * call.c (build_op_delete_call): Implement 7.6.2.5/(10.1). * decl2.c (coerce_delete_type): Use build_pointer_type instead of TYPE_POINTER_TO. /testsuite 2019-01-25 Paolo Carlini PR c++/88969 * g++.dg/cpp2a/destroying-delete2.C: New. * g++.dg/cpp2a/destroying-delete3.C: Likewise. From-SVN: r268278 --- gcc/cp/ChangeLog | 7 +++++++ gcc/cp/call.c | 13 +++++++++++++ gcc/cp/decl2.c | 6 +++--- gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/g++.dg/cpp2a/destroying-delete2.C | 20 ++++++++++++++++++++ gcc/testsuite/g++.dg/cpp2a/destroying-delete3.C | 8 ++++++++ 6 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp2a/destroying-delete2.C create mode 100644 gcc/testsuite/g++.dg/cpp2a/destroying-delete3.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 82a893a..2d7ab90 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2019-01-25 Paolo Carlini + + PR c++/88969 + * call.c (build_op_delete_call): Implement 7.6.2.5/(10.1). + * decl2.c (coerce_delete_type): Use build_pointer_type instead + of TYPE_POINTER_TO. + 2019-01-24 Jason Merrill PR c++/89001 - mangling of reference temporaries diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 5bad263..515a942 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -6461,6 +6461,19 @@ build_op_delete_call (enum tree_code code, tree addr, tree size, continue; } + /* -- If any of the deallocation functions is a destroying + operator delete, all deallocation functions that are not + destroying operator deletes are eliminated from further + consideration. */ + bool fn_destroying = destroying_delete_p (fn); + bool elt_destroying = destroying_delete_p (elt); + if (elt_destroying != fn_destroying) + { + if (elt_destroying) + fn = elt; + continue; + } + /* -- If the type has new-extended alignment, a function with a parameter of type std::align_val_t is preferred; otherwise a function without such a parameter is preferred. If exactly one diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index 5da5beb..72c52e3 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -1757,9 +1757,9 @@ coerce_delete_type (tree decl, location_t loc) if (destroying_delete_p (decl)) { if (DECL_CLASS_SCOPE_P (decl)) - /* If the function is a destroying operator delete declared in class type - C, the type of its first parameter shall be C*. */ - ptrtype = TYPE_POINTER_TO (DECL_CONTEXT (decl)); + /* If the function is a destroying operator delete declared in class + type C, the type of its first parameter shall be C*. */ + ptrtype = build_pointer_type (DECL_CONTEXT (decl)); else /* A destroying operator delete shall be a class member function named operator delete. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 75ce51a..84e195c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2019-01-25 Paolo Carlini + + PR c++/88969 + * g++.dg/cpp2a/destroying-delete2.C: New. + * g++.dg/cpp2a/destroying-delete3.C: Likewise. + 2019-01-25 Steven G. Kargl PR fortran/85780 diff --git a/gcc/testsuite/g++.dg/cpp2a/destroying-delete2.C b/gcc/testsuite/g++.dg/cpp2a/destroying-delete2.C new file mode 100644 index 0000000..2592c07 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/destroying-delete2.C @@ -0,0 +1,20 @@ +// PR c++/88969 +// { dg-do compile { target c++2a } } + +#include + +namespace delete_selection_d { + struct B { + void operator delete(void*) = delete; + void operator delete(B *, std::destroying_delete_t) = delete; // { dg-message "declared here" } + }; + void delete_B(B *b) { delete b; } // { dg-error "use of deleted function" } +} + +namespace delete_selection_r { + struct B { + void operator delete(B *, std::destroying_delete_t) = delete; // { dg-message "declared here" } + void operator delete(void*) = delete; + }; + void delete_B(B *b) { delete b; } // { dg-error "use of deleted function" } +} diff --git a/gcc/testsuite/g++.dg/cpp2a/destroying-delete3.C b/gcc/testsuite/g++.dg/cpp2a/destroying-delete3.C new file mode 100644 index 0000000..112fb0a --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/destroying-delete3.C @@ -0,0 +1,8 @@ +// PR c++/88969 +// { dg-do compile { target c++2a } } + +#include + +struct B { + void operator delete(void*, std::destroying_delete_t); // { dg-error ".operator delete. takes type .B*." } +}; -- 2.7.4