re PR c++/56377 (<missing> template args in substitution-failure diagnostics)

	PR c++/56377
	* pt.c (fn_type_unification): Use explicit args in template
	instantiation context.

From-SVN: r196230

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 6b3aa17edc2a42d3e81b657e81d9155df1ab7ac0..ed5d3995b357d2b6309f7b8dde8faf5c2fcad4b8 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2013-02-22  Jason Merrill  <jason@redhat.com>
 
+       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 440df1ea2317a4803d1fe5a4e6ce63e9ca07e350..a39d114818f6012f8e77d0e2cad0304b740e62bf 100644 (file)
--- 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;