From: Jakub Jelinek <jakub@redhat.com>
Date: Wed, 18 Jan 2006 08:01:02 +0000 (+0100)
Subject: search.c (lookup_conversions_r): Fix a pasto.
X-Git-Tag: releases/gcc-4.2.0~4788
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db2acc366eb6b76887c8cdde6a6c95a9db03dfce;p=thirdparty%2Fgcc.git

search.c (lookup_conversions_r): Fix a pasto.

	* search.c (lookup_conversions_r): Fix a pasto.

	* g++.dg/parse/lookup5.C: New test.

From-SVN: r109877
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index da860eb6b389..f7201ba4520d 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-18  Jakub Jelinek  <jakub@redhat.com>
+
+	* search.c (lookup_conversions_r): Fix a pasto.
+
 2006-01-17  Eric Christopher  <echristo@apple.com>
 
 	* call.c (convert_like_real): When issuing conversion
diff --git a/gcc/cp/search.c b/gcc/cp/search.c
index 090510b4103b..90e88d6865e8 100644
--- a/gcc/cp/search.c
+++ b/gcc/cp/search.c
@@ -2355,7 +2355,7 @@ lookup_conversions_r (tree binfo,
     {
       parent_tpl_convs = tree_cons (binfo, my_tpl_convs, parent_tpl_convs);
       if (virtual_depth)
-	TREE_STATIC (parent_convs) = 1;
+	TREE_STATIC (parent_tpl_convs) = 1;
     }
 
   child_convs = other_convs;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index dc5c57a360ed..61145bc640d6 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-18  Jakub Jelinek  <jakub@redhat.com>
+
+	* g++.dg/parse/lookup5.C: New test.
+
 2006-01-17  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
 	PR fortran/25697
diff --git a/gcc/testsuite/g++.dg/parse/lookup5.C b/gcc/testsuite/g++.dg/parse/lookup5.C
new file mode 100644
index 000000000000..afdf023b50b6
--- /dev/null
+++ b/gcc/testsuite/g++.dg/parse/lookup5.C
@@ -0,0 +1,26 @@
+// { dg-do compile }
+
+struct A {};
+
+template <class T> struct B
+{
+  T a, b;
+  B() {}
+  B(T x, T y) : a(x), b(y) {}
+  template <class U> operator B<U> () const
+  { return B<U>((U)(this->a), (U)(this->b)); }
+};
+
+template <class T> struct C : public B<int>
+{
+  T *c;
+  inline T & operator *() { return *c; }
+};
+
+template <class T> struct D : virtual public C<T> { };
+
+void
+foo (D<A> x)
+{
+  *x;
+}