From: Jason Merrill <jason@redhat.com>
Date: Fri, 16 Jan 2009 06:08:09 +0000 (-0500)
Subject: re PR c++/38850 (Cannot find inline friend function in template class when called... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=751e154916876a0f09397c6f39ccd5ed5544112b;p=thirdparty%2Fgcc.git

re PR c++/38850 (Cannot find inline friend function in template class when called from within a template function)

        PR c++/38850
        * pt.c (tsubst_copy_and_build): Tell finish_call_expr to
        accept hidden friends.

From-SVN: r143423
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 9708b2138662..742f90f75dce 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-15  Jason Merrill  <jason@redhat.com>
+
+	PR c++/38850
+	* pt.c (tsubst_copy_and_build): Tell finish_call_expr to
+	accept hidden friends.
+
 2009-01-12  Dodji Seketeli  <dodji@redhat.com>
 
 	PR c++/36019
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 3bc9edff9a96..260229f15ad3 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -9317,9 +9317,12 @@ tsubst_copy_and_build (tree t,
 		       qualified_p ? LOOKUP_NONVIRTUAL : LOOKUP_NORMAL,
 		       /*fn_p=*/NULL));
 	  }
+	/* Pass true for koenig_p so that build_new_function_call will
+	   allow hidden friends found by arg-dependent lookup at template
+	   parsing time.  */
 	return finish_call_expr (function, call_args,
 				 /*disallow_virtual=*/qualified_p,
-				 koenig_p);
+				 /*koenig_p*/true);
       }
 
     case COND_EXPR:
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 666bc5d7e102..fc8d3f5c0803 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-15  Jason Merrill  <jason@redhat.com>
+
+	PR c++/38850
+	* g++.dg/template/koenig6.C: New test.
+
 2009-01-12  Dodji Seketeli  <dodji@redhat.com>
 
 	PR c++/36019
diff --git a/gcc/testsuite/g++.dg/template/koenig6.C b/gcc/testsuite/g++.dg/template/koenig6.C
new file mode 100644
index 000000000000..8f93a653a7b2
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/koenig6.C
@@ -0,0 +1,29 @@
+// PR c++/38850
+
+template <typename VType>
+class Vector2 {
+ private:
+  VType c_[2];
+ public:
+  typedef Vector2<VType> Self;
+
+  Vector2(const VType x, const VType y) {
+    c_[0] = x;
+    c_[1] = y;
+  }
+
+  friend inline Self Max(const Self &v1, const Self &v2) {
+    return Self(v1.c_[0], v1.c_[1]);
+  }
+};
+
+template <class T>
+Vector2<float> foo(T x) {
+  Vector2<float> y(0,0);
+  return Max(y, y);
+}
+
+int main() {
+  foo(3);
+  return 0;
+}