From: Jason Merrill <jason@redhat.com>
Date: Wed, 20 Feb 2008 04:47:47 +0000 (-0500)
Subject: re PR c++/34950 (ICE in svn boost math toolkit)
X-Git-Tag: prereleases/gcc-4.2.4-rc1~119
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb78d95d3ae698a6f73aedd072de352e641ba51f;p=thirdparty%2Fgcc.git

re PR c++/34950 (ICE in svn boost math toolkit)

        PR c++/34950
        * pt.c (resolve_overloaded_unification): Set processing_template_decl
        while we look for possible bindings.

From-SVN: r132470
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 85f19d70903f..3727488fcd04 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-19  Jason Merrill  <jason@redhat.com>
+
+	PR c++/34950
+	* pt.c (resolve_overloaded_unification): Set processing_template_decl
+	while we look for possible bindings.
+
 2008-02-13  Jason Merrill  <jason@redhat.com>
 
 	PR c++/34774
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index e459da26153a..721f02bfe61a 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -10107,6 +10107,7 @@ resolve_overloaded_unification (tree tparms,
 	  if (TREE_CODE (fn) != TEMPLATE_DECL)
 	    continue;
 
+	  ++processing_template_decl;
 	  subargs = get_bindings (fn, DECL_TEMPLATE_RESULT (fn),
 				  expl_subargs, /*check_ret=*/false);
 	  if (subargs)
@@ -10115,6 +10116,7 @@ resolve_overloaded_unification (tree tparms,
 	      good += try_one_overload (tparms, targs, tempargs, parm,
 					elem, strict, sub_strict, addr_p);
 	    }
+	  --processing_template_decl;
 	}
     }
   else if (TREE_CODE (arg) != OVERLOAD