2016-02-25 Jason Merrill <jason@redhat.com>
+ PR c++/69889
+ * cp-tree.h (AGGR_INIT_FROM_THUNK_P): New.
+ * tree.c (build_aggr_init_expr): Set it.
+ * semantics.c (simplify_aggr_init_expr): Check it.
+ * cp-gimplify.c (cp_genericize_r): Don't walk into
+ a call/aggr_init from a thunk.
+
PR c++/69842
* method.c (forward_parm): Handle parameter packs.
* lambda.c (maybe_add_lambda_conv_op): Use it for them.
&& omp_var_to_track (stmt))
omp_cxx_notice_variable (wtd->omp_ctx, stmt);
- if (is_invisiref_parm (stmt)
- /* Don't dereference parms in a thunk, pass the references through. */
- && !(DECL_THUNK_P (current_function_decl)
- && TREE_CODE (stmt) == PARM_DECL))
+ /* Don't dereference parms in a thunk, pass the references through. */
+ if ((TREE_CODE (stmt) == CALL_EXPR && CALL_FROM_THUNK_P (stmt))
+ || (TREE_CODE (stmt) == AGGR_INIT_EXPR && AGGR_INIT_FROM_THUNK_P (stmt)))
+ {
+ *walk_subtrees = 0;
+ return NULL;
+ }
+
+ /* Otherwise, do dereference invisible reference parms. */
+ if (is_invisiref_parm (stmt))
{
*stmt_p = convert_from_reference (stmt);
*walk_subtrees = 0;
#define AGGR_INIT_ZERO_FIRST(NODE) \
TREE_LANG_FLAG_2 (AGGR_INIT_EXPR_CHECK (NODE))
+/* Nonzero means that the call is the jump from a thunk to the
+ thunked-to function. */
+#define AGGR_INIT_FROM_THUNK_P(NODE) \
+ (AGGR_INIT_EXPR_CHECK (NODE)->base.protected_flag)
+
/* AGGR_INIT_EXPR accessors. These are equivalent to the CALL_EXPR
accessors, except for AGGR_INIT_EXPR_SLOT (which takes the place of
CALL_EXPR_STATIC_CHAIN). */
AGGR_INIT_EXPR_ARGP (aggr_init_expr));
TREE_NOTHROW (call_expr) = TREE_NOTHROW (aggr_init_expr);
CALL_EXPR_LIST_INIT_P (call_expr) = CALL_EXPR_LIST_INIT_P (aggr_init_expr);
+ CALL_FROM_THUNK_P (call_expr) = AGGR_INIT_FROM_THUNK_P (aggr_init_expr);
if (style == ctor)
{
{
slot = build_local_temp (type);
- if (TREE_CODE(init) == CALL_EXPR)
- rval = build_aggr_init_array (void_type_node, fn, slot,
- call_expr_nargs (init),
- CALL_EXPR_ARGP (init));
+ if (TREE_CODE (init) == CALL_EXPR)
+ {
+ rval = build_aggr_init_array (void_type_node, fn, slot,
+ call_expr_nargs (init),
+ CALL_EXPR_ARGP (init));
+ AGGR_INIT_FROM_THUNK_P (rval)
+ = CALL_FROM_THUNK_P (init);
+ }
else
- rval = build_aggr_init_array (void_type_node, fn, slot,
- aggr_init_expr_nargs (init),
- AGGR_INIT_EXPR_ARGP (init));
+ {
+ rval = build_aggr_init_array (void_type_node, fn, slot,
+ aggr_init_expr_nargs (init),
+ AGGR_INIT_EXPR_ARGP (init));
+ AGGR_INIT_FROM_THUNK_P (rval)
+ = AGGR_INIT_FROM_THUNK_P (init);
+ }
TREE_SIDE_EFFECTS (rval) = 1;
AGGR_INIT_VIA_CTOR_P (rval) = is_ctor;
TREE_NOTHROW (rval) = TREE_NOTHROW (init);
--- /dev/null
+// PR c++/69889
+// { dg-do compile { target c++11 } }
+
+template <typename F> struct Tag {
+ static void fp() { f()(0); }
+ static F f() {}
+};
+
+struct Dispatch {
+ template <typename F> Dispatch(F&&) : f(Tag<F>::fp) {}
+ void (*f)();
+};
+
+struct Empty { Empty(Empty&&); };
+
+struct Value {
+ Value();
+ template <typename U> Value(U);
+ void call(Dispatch);
+ Empty e;
+};
+
+struct EmptyValue {
+ EmptyValue(EmptyValue&&);
+ EmptyValue();
+};
+
+struct User {
+ User() {
+ Value().call([](Value) { return EmptyValue(); });
+ }
+};
+
+User user;