From: Mark Mitchell <mmitchel@gcc.gnu.org>
Date: Mon, 2 Oct 2006 04:12:51 +0000 (+0000)
Subject: re PR c++/29105 (segfault in add_candidates with a non template base class and a... 
X-Git-Tag: releases/gcc-4.2.0~1174
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=51a203d95e956aacdb9c6432f9fabdee3c20276e;p=thirdparty%2Fgcc.git

re PR c++/29105 (segfault in add_candidates with a non template base class and a template member function)

	PR c++/29105
	* pt.c (tsubst_baselink): Substituteinto the qualifying scope.
	* semantics.c (baselink_for_fns): Build a baselink, even when
	processing a template.
	PR c++/29105
	* g++.dg/template/member6.C: New test.
	* g++.dg/parse/typename7.C: Adjust error markers.

From-SVN: r117361
---

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 4e8fad66e5c3..3106023d89a6 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -7779,15 +7779,15 @@ tsubst_baselink (tree baselink, tree object_type,
     tree template_args = 0;
     bool template_id_p = false;
 
-    /* A baselink indicates a function from a base class.  The
-       BASELINK_ACCESS_BINFO and BASELINK_BINFO are going to have
-       non-dependent types; otherwise, the lookup could not have
-       succeeded.  However, they may indicate bases of the template
-       class, rather than the instantiated class.
-
-       In addition, lookups that were not ambiguous before may be
-       ambiguous now.  Therefore, we perform the lookup again.  */
+    /* A baselink indicates a function from a base class.  Both the
+       BASELINK_ACCESS_BINFO and the base class referenced may
+       indicate bases of the template class, rather than the
+       instantiated class.  In addition, lookups that were not
+       ambiguous before may be ambiguous now.  Therefore, we perform
+       the lookup again.  */
     qualifying_scope = BINFO_TYPE (BASELINK_ACCESS_BINFO (baselink));
+    qualifying_scope = tsubst (qualifying_scope, args,
+			       complain, in_decl);
     fns = BASELINK_FUNCTIONS (baselink);
     optype = BASELINK_OPTYPE (baselink);
     if (TREE_CODE (fns) == TEMPLATE_ID_EXPR)
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 3c7281880d4e..91d200a588e8 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -2400,7 +2400,6 @@ baselink_for_fns (tree fns)
   tree cl;
 
   if (BASELINK_P (fns) 
-      || processing_template_decl
       || error_operand_p (fns))
     return fns;
   
diff --git a/gcc/testsuite/g++.dg/parse/typename7.C b/gcc/testsuite/g++.dg/parse/typename7.C
index 56fcc7436a4a..3cee4bac68bf 100644
--- a/gcc/testsuite/g++.dg/parse/typename7.C
+++ b/gcc/testsuite/g++.dg/parse/typename7.C
@@ -11,7 +11,7 @@ struct A
   template<typename T> void bar(T t) {
     this->foo<typename T>(t); } // { dg-error "expected|parse error|no matching" }
   template<typename T> void bad(T t) {
-    foo<typename T>(t); } // { dg-error "expected|parse error" }
+    foo<typename T>(t); } // { dg-error "expected|parse error|no matching" }
 };
 
 template <typename T>
diff --git a/gcc/testsuite/g++.dg/template/member6.C b/gcc/testsuite/g++.dg/template/member6.C
new file mode 100644
index 000000000000..7d66e7bdae61
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/member6.C
@@ -0,0 +1,16 @@
+// PR c++/29105
+
+struct Observer
+{
+  template < typename T > void observeComponent ();
+};
+
+template < typename T >
+struct TagFilter : Observer
+{
+  TagFilter ()
+  {
+    observeComponent < int > ();
+  }
+};
+