diff --git a/gcc/cp/init.c b/gcc/cp/init.c index ffb84ea5b092204bba706ac5918cbedf726785d9..0b98f338feb53c309a3ac9914666ae64bb37b134 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -3766,7 +3766,11 @@ build_new (location_t loc, vec<tree, va_gc> **placement, tree type, /* P1009: Array size deduction in new-expressions. */ const bool array_p = TREE_CODE (type) == ARRAY_TYPE; - if (*init && (array_p || (nelts && cxx_dialect >= cxx20))) + if (*init + /* If ARRAY_P, we have to deduce the array bound. For C++20 paren-init, + we have to process the parenthesized-list. But don't do it for (), + which is value-initialization, and INIT should stay empty. */ + && (array_p || (cxx_dialect >= cxx20 && nelts && !(*init)->is_empty ()))) { /* This means we have 'new T[]()'. */ if ((*init)->is_empty ()) diff --git a/gcc/testsuite/g++.dg/expr/anew5.C b/gcc/testsuite/g++.dg/expr/anew5.C new file mode 100644 index 0000000000000000000000000000000000000000..d597caf548340560ce6aa4c6546ba2e8725b3bf5 --- /dev/null +++ b/gcc/testsuite/g++.dg/expr/anew5.C @@ -0,0 +1,26 @@ +// PR c++/97523 +// { dg-do compile } +// We were turning the () into {} which made it seem like +// aggregate-initialization (we are dealing with arrays here), which +// performs copy-initialization, which only accepts converting constructors. + +struct T { + explicit T(); + T(int); +}; + +void +fn (int n) +{ + new T[1](); + new T[2](); + new T[3](); + new T[n](); +#if __cpp_aggregate_paren_init + new T[](); + new T[2](1, 2); + // T[2] is initialized via copy-initialization, so we can't call + // explicit T(). + new T[3](1, 2); // { dg-error "explicit constructor" "" { target c++20 } } +#endif +} diff --git a/gcc/testsuite/g++.dg/expr/anew6.C b/gcc/testsuite/g++.dg/expr/anew6.C new file mode 100644 index 0000000000000000000000000000000000000000..0542daac2759136e4d286e42938946f81c6fbebc --- /dev/null +++ b/gcc/testsuite/g++.dg/expr/anew6.C @@ -0,0 +1,33 @@ +// PR c++/97523 +// { dg-do compile { target c++11 } } + +// [expr.new]/24: If the new-expression creates an object or an array of +// objects of class type, access and ambiguity control are done for the +// [...] constructor selected for the initialization (if any). +// NB: We only check for a default constructor if the array has a non-constant +// bound, or there are insufficient initializers. Since an array is an +// aggregate, we perform aggregate-initialization, which performs +// copy-initialization, so we only accept converting constructors. + +struct T { + explicit T(); + T(int); +}; + +struct S { + S(int); +}; + +void +fn (int n) +{ + new T[1]{}; // { dg-error "explicit constructor" } + new T[2]{1, 2}; + new T[3]{1, 2}; // { dg-error "explicit constructor" } + new T[n]{}; // { dg-error "explicit constructor" } + + new S[1]{}; // { dg-error "could not convert" } + new S[2]{1, 2}; + new S[3]{1, 2}; // { dg-error "could not convert" } + new S[n]{}; // { dg-error "could not convert" } +}