2012-06-01 Jason Merrill <jason@redhat.com>
+ PR c++/53137
+ * pt.c (instantiate_class_template_1): Set LAMBDA_EXPR_THIS_CAPTURE.
+ (instantiate_decl): Don't push_to_top_level for local class methods.
+ (instantiate_class_template_1): Or for local classes.
+
PR c++/53484
* pt.c (do_auto_deduction): Don't try to deduce from a
type-dependent initializer.
tree pbinfo;
tree base_list;
unsigned int saved_maximum_field_alignment;
+ tree fn_context;
if (type == error_mark_node)
return error_mark_node;
it now. */
push_deferring_access_checks (dk_no_deferred);
- push_to_top_level ();
+ fn_context = decl_function_context (TYPE_MAIN_DECL (type));
+ if (!fn_context)
+ push_to_top_level ();
/* Use #pragma pack from the template context. */
saved_maximum_field_alignment = maximum_field_alignment;
maximum_field_alignment = TYPE_PRECISION (pattern);
tree decl = lambda_function (type);
if (decl)
{
+ tree lam = CLASSTYPE_LAMBDA_EXPR (type);
+ LAMBDA_EXPR_THIS_CAPTURE (lam)
+ = lookup_field_1 (type, get_identifier ("__this"), false);
+
instantiate_decl (decl, false, false);
maybe_add_lambda_conv_op (type);
+
+ LAMBDA_EXPR_THIS_CAPTURE (lam) = NULL_TREE;
}
else
gcc_assert (errorcount);
perform_deferred_access_checks ();
pop_nested_class ();
maximum_field_alignment = saved_maximum_field_alignment;
- pop_from_top_level ();
+ if (!fn_context)
+ pop_from_top_level ();
pop_deferring_access_checks ();
pop_tinst_level ();
tree spec;
tree gen_tmpl;
bool pattern_defined;
- int need_push;
location_t saved_loc = input_location;
bool external_p;
+ tree fn_context;
+ bool nested;
/* This function should only be used to instantiate templates for
functions and static member variables. */
goto out;
}
- need_push = !cfun || !global_bindings_p ();
- if (need_push)
+ fn_context = decl_function_context (d);
+ nested = (current_function_decl != NULL_TREE);
+ if (!fn_context)
push_to_top_level ();
+ else if (nested)
+ push_function_context ();
/* Mark D as instantiated so that recursive calls to
instantiate_decl do not try to instantiate it again. */
/* We're not deferring instantiation any more. */
TI_PENDING_TEMPLATE_FLAG (DECL_TEMPLATE_INFO (d)) = 0;
- if (need_push)
+ if (!fn_context)
pop_from_top_level ();
+ else if (nested)
+ pop_function_context ();
out:
input_location = saved_loc;