+2010-11-13 Jason Merrill <jason@redhat.com>
+
+ * decl.c (cp_finish_decl): Use resolve_nondeduced_context for auto.
+ * init.c (build_new): Likewise.
+ * pt.c (tsubst_decl): Likewise.
+ (do_auto_deduction): Likewise.
+ (resolve_nondeduced_context): Use build_offset_ref and
+ cp_build_addr_expr.
+
2010-11-12 Joseph Myers <joseph@codesourcery.com>
* Make-lang.in (g++spec.o): Use $(OPTS_H).
if (TREE_CODE (d_init) == TREE_LIST)
d_init = build_x_compound_expr_from_list (d_init, ELK_INIT,
tf_warning_or_error);
+ d_init = resolve_nondeduced_context (d_init);
if (describable_type (d_init))
{
type = TREE_TYPE (decl) = do_auto_deduction (type, d_init,
if (nelts == NULL_TREE && VEC_length (tree, *init) == 1)
{
tree auto_node = type_uses_auto (type);
- if (auto_node && describable_type (VEC_index (tree, *init, 0)))
- type = do_auto_deduction (type, VEC_index (tree, *init, 0), auto_node);
+ if (auto_node)
+ {
+ tree d_init = VEC_index (tree, *init, 0);
+ d_init = resolve_nondeduced_context (d_init);
+ if (describable_type (d_init))
+ type = do_auto_deduction (type, d_init, auto_node);
+ }
}
if (processing_template_decl)
= tsubst_expr (DECL_INITIAL (t), args, complain, in_decl,
/*constant_expression_p=*/false);
- if (auto_node && init && describable_type (init))
+ if (auto_node && init)
{
- type = do_auto_deduction (type, init, auto_node);
- TREE_TYPE (r) = type;
+ init = resolve_nondeduced_context (init);
+ if (describable_type (init))
+ {
+ type = do_auto_deduction (type, init, auto_node);
+ TREE_TYPE (r) = type;
+ }
}
}
else
BASELINK_ACCESS_BINFO (baselink),
expr, BASELINK_OPTYPE (baselink));
if (offset)
- expr = build2 (OFFSET_REF, TREE_TYPE (expr),
- TREE_OPERAND (offset, 0), expr);
+ {
+ tree base
+ = TYPE_MAIN_VARIANT (TREE_TYPE (TREE_OPERAND (offset, 0)));
+ expr = build_offset_ref (base, expr, addr);
+ }
if (addr)
- expr = build_address (expr);
+ expr = cp_build_addr_expr (expr, tf_warning_or_error);
return expr;
}
else if (good == 0 && badargs)
if (BRACE_ENCLOSED_INITIALIZER_P (init))
type = listify_autos (type, auto_node);
+ init = resolve_nondeduced_context (init);
+
parms = build_tree_list (NULL_TREE, type);
args[0] = init;
tparms = make_tree_vec (1);
+2010-11-13 Jason Merrill <jason@redhat.com>
+
+ * g++.dg/cpp0x/auto20.C: New.
+
2010-11-13 Iain Sandoe <iains@gcc.gnu.org>
* objc.dg/fsf-nsstring-format-1.m: Adjust format messages.
--- /dev/null
+// Test for proper non-deduced context handling of the initializer
+// for an auto declaration/new.
+// { dg-options -std=c++0x }
+
+struct with_apply
+{
+ template <unsigned>
+ void apply(const double&){}
+};
+
+auto p = &with_apply::apply<0>;
+auto pp = new auto(&with_apply::apply<0>);
+
+template <class T>
+void f()
+{
+ auto p = &T::template apply<0>;
+}
+
+template void f<with_apply>();