@@ -3284,7 +3284,13 @@ build_new_1 (vec<tree, va_gc> **placement, tree type, tree nelts,
tree align_arg = NULL_TREE;
if (type_has_new_extended_alignment (elt_type))
- align_arg = build_int_cst (align_type_node, TYPE_ALIGN_UNIT (elt_type));
+ {
+ unsigned align = TYPE_ALIGN_UNIT (elt_type);
+ /* Also consider the alignment of the cookie, if any. */
+ if (TYPE_VEC_NEW_USES_COOKIE (elt_type))
+ align = MAX (align, TYPE_ALIGN_UNIT (size_type_node));
+ align_arg = build_int_cst (align_type_node, align);
+ }
alloc_fn = NULL_TREE;
@@ -3473,18 +3479,19 @@ build_new_1 (vec<tree, va_gc> **placement, tree type, tree nelts,
}
}
+ alloc_expr = alloc_call;
if (cookie_size)
- alloc_call = maybe_wrap_new_for_constexpr (alloc_call, type,
+ alloc_expr = maybe_wrap_new_for_constexpr (alloc_expr, type,
cookie_size);
/* In the simple case, we can stop now. */
pointer_type = build_pointer_type (type);
if (!cookie_size && !is_initialized && !member_delete_p)
- return build_nop (pointer_type, alloc_call);
+ return build_nop (pointer_type, alloc_expr);
/* Store the result of the allocation call in a variable so that we can
use it more than once. */
- alloc_expr = get_target_expr (alloc_call);
+ alloc_expr = get_target_expr (alloc_expr);
alloc_node = TARGET_EXPR_SLOT (alloc_expr);
/* Strip any COMPOUND_EXPRs from ALLOC_CALL. */
new file mode 100644
@@ -0,0 +1,26 @@
+// PR c++/102071
+// { dg-do run { target c++17 } }
+// { dg-additional-options -faligned-new=2 }
+
+#include <new>
+
+int nalign;
+void *operator new (std::size_t s, std::align_val_t a)
+{
+ nalign = (int)a;
+ return operator new (s);
+}
+
+struct X { ~X(); int c; };
+
+int align = (alignof (X) > alignof (std::size_t)
+ ? alignof (X) : alignof (std::size_t));
+
+int n = 4;
+
+int main()
+{
+ X *p = new X[n];
+ if (nalign != align)
+ __builtin_abort ();
+}