cp:

	PR c++/10158
	* parser.c (cp_parser_function_definition): Set
	DECL_INITIALIZED_IN_CLASS for members.
	* pt.c (instantiate_decl): Only reduce the template args for
	friends that are not defined in class.
testsuite:
	PR c++/10158
	* g++.dg/template/friend18.C: New test.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@64920 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 19 insertions, 0 deletions

diff --git a/gcc/testsuite/g++.dg/template/friend18.C b/gcc/testsuite/g++.dg/template/friend18.C
new file mode 100644
index 00000000000..04ba26e9830
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/friend18.C
@@ -0,0 +1,19 @@
+// { dg-do run }
+
+// Copyright (C) 2003 Free Software Foundation, Inc.
+// Contributed by Nathan Sidwell 26 Mar 2003 <nathan@codesourcery.com>
+
+// PR 10158. implicit inline template friends ICE'd
+
+template <int N> struct X
+{
+  template <int M> friend int foo(X const &)
+  {
+    return N * 10000 + M;
+  }
+};
+X<1234> bring;
+
+int main() {
+  return foo<5678> (bring) != 12345678;
+}