@@ -7413,12 +7413,19 @@ check_initializer (tree decl, tree init, int flags, vec<tree, va_gc> **cleanups)
/* Declared constexpr or constinit, but no suitable initializer;
massage init appropriately so we can pass it into
store_init_value for the error. */
- if (CLASS_TYPE_P (type)
- && (!init || TREE_CODE (init) == TREE_LIST))
+ tree new_init = NULL_TREE;
+ if (!processing_template_decl
+ && TREE_CODE (init_code) == CALL_EXPR)
+ new_init = build_cplus_new (type, init_code, tf_none);
+ else if (CLASS_TYPE_P (type)
+ && (!init || TREE_CODE (init) == TREE_LIST))
+ new_init = build_functional_cast (input_location, type,
+ init, tf_none);
+ if (new_init)
{
- init = build_functional_cast (input_location, type,
- init, tf_none);
- if (TREE_CODE (init) == TARGET_EXPR)
+ init = new_init;
+ if (TREE_CODE (init) == TARGET_EXPR
+ && !(flags & LOOKUP_ONLYCONVERTING))
TARGET_EXPR_DIRECT_INIT_P (init) = true;
}
init_code = NULL_TREE;
new file mode 100644
@@ -0,0 +1,12 @@
+// PR c++/102307
+// { dg-do compile { target c++11 } }
+
+#include <array>
+template <unsigned N, unsigned M> struct Matrix {
+ constexpr Matrix(double const (&arr)[N][M]); // { dg-warning "never defined" }
+ constexpr Matrix(std::array<std::array<double, M>, N> const &arr);
+};
+int main() {
+ constexpr Matrix<2, 3>
+ mat {{ {1.0, 2.0, 3.0}, {4.0, 5.0, 6.0} }}; // { dg-error "before its definition" }
+}