[pushed] c++: class array new checking [PR104084]
Commit Message
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.
Tested x86_64-pc-linux-gnu, applying to trunk.
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.
---
gcc/cp/init.cc | 2 +-
gcc/testsuite/g++.dg/init/new50.C | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
create mode 100644 gcc/testsuite/g++.dg/init/new50.C
base-commit: c163647ffbc9a20c8feb6e079dbecccfe016c82e
@@ -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);
new file mode 100644
@@ -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]; }
+};