diff mbox series

c++: Check if allocation functions are xobj members [PR114078]

Message ID 66237f55.170a0220.88a25.0553@mx.google.com
State Committed
Commit cf51fe706ea0219beb5bb85e81606d372ca9635e
Headers
Series c++: Check if allocation functions are xobj members [PR114078] |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gcc_build--master-arm success Testing passed
linaro-tcwg-bot/tcwg_gcc_check--master-arm success Testing passed
linaro-tcwg-bot/tcwg_gcc_build--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_gcc_check--master-aarch64 success Testing passed

Commit Message

Nathaniel Shead April 20, 2024, 8:39 a.m. UTC 
  Bootstrapped and regtested on x86_64-pc-linux-gnu, OK for trunk?

-- >8 --

A class allocation member function is implicitly 'static' by
[class.free] p3, so cannot have an explicit object parameter.

	PR c++/114078

gcc/cp/ChangeLog:

	* decl.cc (grokdeclarator): Check allocation functions for xobj
	parameters.

gcc/testsuite/ChangeLog:

	* g++.dg/cpp23/explicit-obj-ops-alloc.C: New test.

Signed-off-by: Nathaniel Shead <nathanieloshead@gmail.com>
---
 gcc/cp/decl.cc                                      |  6 ++++++
 gcc/testsuite/g++.dg/cpp23/explicit-obj-ops-alloc.C | 11 +++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/cpp23/explicit-obj-ops-alloc.C

Comments

Patrick Palka April 22, 2024, 2:59 a.m. UTC | #1 
On Sat, 20 Apr 2024, Nathaniel Shead wrote:

> Bootstrapped and regtested on x86_64-pc-linux-gnu, OK for trunk?
> 
> -- >8 --
> 
> A class allocation member function is implicitly 'static' by
> [class.free] p3, so cannot have an explicit object parameter.
> 
> 	PR c++/114078
> 
> gcc/cp/ChangeLog:
> 
> 	* decl.cc (grokdeclarator): Check allocation functions for xobj
> 	parameters.
> 
> gcc/testsuite/ChangeLog:
> 
> 	* g++.dg/cpp23/explicit-obj-ops-alloc.C: New test.

LGTM

> 
> Signed-off-by: Nathaniel Shead <nathanieloshead@gmail.com>
> ---
>  gcc/cp/decl.cc                                      |  6 ++++++
>  gcc/testsuite/g++.dg/cpp23/explicit-obj-ops-alloc.C | 11 +++++++++++
>  2 files changed, 17 insertions(+)
>  create mode 100644 gcc/testsuite/g++.dg/cpp23/explicit-obj-ops-alloc.C
> 
> diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc
> index 65ab64885ff..2af026d255d 100644
> --- a/gcc/cp/decl.cc
> +++ b/gcc/cp/decl.cc
> @@ -13728,6 +13728,12 @@ grokdeclarator (const cp_declarator *declarator,
>  			inform (DECL_SOURCE_LOCATION (xobj_parm),
>  				"explicit object parameter declared here");
>  		      }
> +		    if (unqualified_id
> +			&& identifier_p (unqualified_id)
> +			&& IDENTIFIER_NEWDEL_OP_P (unqualified_id))
> +		      error_at (DECL_SOURCE_LOCATION (xobj_parm),
> +				"%qD cannot be an explicit object member "
> +				"function", unqualified_id);
>  		  }
>  	      }
>  	    tree pushed_scope = NULL_TREE;
> diff --git a/gcc/testsuite/g++.dg/cpp23/explicit-obj-ops-alloc.C b/gcc/testsuite/g++.dg/cpp23/explicit-obj-ops-alloc.C
> new file mode 100644
> index 00000000000..8a277db7ef5
> --- /dev/null
> +++ b/gcc/testsuite/g++.dg/cpp23/explicit-obj-ops-alloc.C
> @@ -0,0 +1,11 @@
> +// PR c++/114078
> +// { dg-do compile { target c++23 } }
> +
> +using size_t = decltype(sizeof(0));
> +
> +struct S {
> +  void* operator new(this size_t);  // { dg-error "explicit object" }
> +  void* operator new[](this size_t);  // { dg-error "explicit object" }
> +  void operator delete(this void*);  // { dg-error "explicit object" }
> +  void operator delete[](this void*);  // { dg-error "explicit object" }
> +};
> -- 
> 2.43.2
> 
>
Jason Merrill April 23, 2024, 3:15 a.m. UTC | #2 
On 4/21/24 19:59, Patrick Palka wrote:
> On Sat, 20 Apr 2024, Nathaniel Shead wrote:
> 
>> Bootstrapped and regtested on x86_64-pc-linux-gnu, OK for trunk?
>>
>> -- >8 --
>>
>> A class allocation member function is implicitly 'static' by
>> [class.free] p3, so cannot have an explicit object parameter.
>>
>> 	PR c++/114078
>>
>> gcc/cp/ChangeLog:
>>
>> 	* decl.cc (grokdeclarator): Check allocation functions for xobj
>> 	parameters.
>>
>> gcc/testsuite/ChangeLog:
>>
>> 	* g++.dg/cpp23/explicit-obj-ops-alloc.C: New test.
> 
> LGTM

Agreed, OK.
diff mbox series

Patch

diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc
index 65ab64885ff..2af026d255d 100644
--- a/gcc/cp/decl.cc
+++ b/gcc/cp/decl.cc
@@ -13728,6 +13728,12 @@  grokdeclarator (const cp_declarator *declarator,
 			inform (DECL_SOURCE_LOCATION (xobj_parm),
 				"explicit object parameter declared here");
 		      }
+		    if (unqualified_id
+			&& identifier_p (unqualified_id)
+			&& IDENTIFIER_NEWDEL_OP_P (unqualified_id))
+		      error_at (DECL_SOURCE_LOCATION (xobj_parm),
+				"%qD cannot be an explicit object member "
+				"function", unqualified_id);
 		  }
 	      }
 	    tree pushed_scope = NULL_TREE;
diff --git a/gcc/testsuite/g++.dg/cpp23/explicit-obj-ops-alloc.C b/gcc/testsuite/g++.dg/cpp23/explicit-obj-ops-alloc.C
new file mode 100644
index 00000000000..8a277db7ef5
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp23/explicit-obj-ops-alloc.C
@@ -0,0 +1,11 @@ 
+// PR c++/114078
+// { dg-do compile { target c++23 } }
+
+using size_t = decltype(sizeof(0));
+
+struct S {
+  void* operator new(this size_t);  // { dg-error "explicit object" }
+  void* operator new[](this size_t);  // { dg-error "explicit object" }
+  void operator delete(this void*);  // { dg-error "explicit object" }
+  void operator delete[](this void*);  // { dg-error "explicit object" }
+};