c++: class array new checking [PR104084]

My patch for PR20040 made us stop exiting early from build_new_1 in
cases of trivial initialization if there's a class operator delete; as a
result, code later in the function needs to handle this case properly.

	PR c++/104084
	PR c++/20040

gcc/cp/ChangeLog:

	* init.cc (build_new_1): Only pull out TARGET_EXPR_INITIAL if
	alloc_expr is a TARGET_EXPR.

gcc/testsuite/ChangeLog:

	* g++.dg/init/new50.C: New test.
This commit is contained in:
Jason Merrill 2022-01-21 12:49:03 -05:00
parent c163647ffb
commit 847a8301ad
2 changed files with 10 additions and 1 deletions

View File

@ -3786,7 +3786,7 @@ build_new_1 (vec<tree, va_gc> **placement, tree type, tree nelts,
if (cookie_expr)
rval = build2 (COMPOUND_EXPR, TREE_TYPE (rval), cookie_expr, rval);
if (rval == data_addr)
if (rval == data_addr && TREE_CODE (alloc_expr) == TARGET_EXPR)
/* If we don't have an initializer or a cookie, strip the TARGET_EXPR
and return the call (which doesn't need to be adjusted). */
rval = TARGET_EXPR_INITIAL (alloc_expr);

View File

@ -0,0 +1,9 @@
// PR c++/104084
int nothrow;
struct MaxAlignedAllocable {
void *operator new[](__SIZE_TYPE__, int);
void operator delete[](void *);
long Resize_size;
void Resize() { new (nothrow) MaxAlignedAllocable[Resize_size]; }
};