From 82a1326b09d144a886124770e405a807f27ad4e8 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Fri, 22 Feb 2013 17:24:27 -0500 Subject: [PATCH] re PR c++/56377 ( template args in substitution-failure diagnostics) PR c++/56377 * pt.c (fn_type_unification): Use explicit args in template instantiation context. From-SVN: r196230 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/pt.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 6b3aa17edc2..ed5d3995b35 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2013-02-22 Jason Merrill + PR c++/56377 + * pt.c (fn_type_unification): Use explicit args in template + instantiation context. + PR c++/56359 * call.c (can_convert_arg): Discard access checks. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 440df1ea231..a39d114818f 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -15008,8 +15008,10 @@ fn_type_unification (tree fn, processing_template_decl += incomplete; input_location = DECL_SOURCE_LOCATION (fn); + TREE_VALUE (tinst) = explicit_targs; fntype = tsubst (TREE_TYPE (fn), explicit_targs, complain | tf_partial, NULL_TREE); + TREE_VALUE (tinst) = targs; input_location = loc; processing_template_decl -= incomplete; -- 2.30.2