@@ -79,6 +79,10 @@ build_lambda_object (tree lambda_expr)
goto out;
}
+ if (TREE_CODE (val) == TREE_LIST)
+ val = build_x_compound_expr_from_list (val, ELK_INIT,
+ tf_warning_or_error);
+
if (DECL_P (val))
mark_used (val);
@@ -449,7 +453,9 @@ add_capture (tree lambda, tree id, tree orig_init, bool by_reference_p,
variadic = true;
}
- if (TREE_CODE (initializer) == TREE_LIST)
+ if (TREE_CODE (initializer) == TREE_LIST
+ /* A pack expansion might end up with multiple elements. */
+ && !PACK_EXPANSION_P (TREE_VALUE (initializer)))
initializer = build_x_compound_expr_from_list (initializer, ELK_INIT,
tf_warning_or_error);
type = TREE_TYPE (initializer);
@@ -13619,6 +13619,18 @@ tsubst (tree t, tree args, tsubst_flags_t complain, tree in_decl)
/*function_p*/false,
/*integral_constant_expression*/false);
+ if (DECLTYPE_FOR_INIT_CAPTURE (t))
+ {
+ if (type == NULL_TREE)
+ {
+ if (complain & tf_error)
+ error ("empty initializer in lambda init-capture");
+ type = error_mark_node;
+ }
+ else if (TREE_CODE (type) == TREE_LIST)
+ type = build_x_compound_expr_from_list (type, ELK_INIT, complain);
+ }
+
--cp_unevaluated_operand;
--c_inhibit_evaluation_warnings;
new file mode 100644
@@ -0,0 +1,13 @@
+// PR c++/71837
+// { dg-do compile { target c++14 } }
+
+template < typename ... Ts > void f (Ts ... args)
+{
+ [ts (args ...)] { return ts; } ();
+}
+
+int main ()
+{
+ f (0);
+ return 0;
+}
new file mode 100644
@@ -0,0 +1,14 @@
+// PR c++/71837
+// { dg-do compile { target c++14 } }
+
+template < typename ... Ts > void f (Ts ... args)
+{
+ [ts (args ...)] { return ts; } (); // { dg-error "" }
+}
+
+int main ()
+{
+ f (); // { dg-message "required" }
+ f (1,2); // { dg-message "required" }
+ return 0;
+}