From: Jason Merrill <jason@redhat.com>
Date: Fri, 22 Feb 2013 22:24:27 +0000 (-0500)
Subject: re PR c++/56377 (<missing> template args in substitution-failure diagnostics)
X-Git-Tag: releases/gcc-4.8.0~333
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=82a1326b09d144a886124770e405a807f27ad4e8;p=thirdparty%2Fgcc.git

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 6b3aa17edc2a..ed5d3995b357 100644
--- 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 440df1ea2317..a39d114818f6 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;