re PR c++/46807 (internal compiler error: in synthesized_method_walk)

	PR c++/46807
	* method.c (synthesized_method_walk): Always exit early for
	trivial fn in C++98 mode.

From-SVN: r170207

3 files changed, 51 insertions, 0 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d6834fb..2608ce5 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-15  Jason Merrill  <jason@redhat.com>
+
+	* g++.dg/inherit/implicit-trivial1.C: New.
+	* g++.dg/cpp0x/implicit-trivial1.C: New.
+
 2011-02-15  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR middle-end/47725
diff --git a/gcc/testsuite/g++.dg/cpp0x/implicit-trivial1.C b/gcc/testsuite/g++.dg/cpp0x/implicit-trivial1.C
new file mode 100644
index 0000000..64084c1
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/implicit-trivial1.C
@@ -0,0 +1,23 @@
+// PR c++/46807
+// { dg-options -std=c++0x }
+// In C++98/03, B::B(const B&) is trivial because A::A(const A&) is trivial,
+// even though doing overload resolution would mean calling the template
+// constructor.  In C++0x, we do overload resolution to determine triviality.
+
+struct A
+{
+  A() {}
+private:
+  template <class T> A(T&);	// { dg-error "private" }
+};
+
+struct B			// { dg-error "implicitly deleted|this context" }
+{
+  mutable A a;
+};
+
+int main()
+{
+  B b;
+  B b2(b);			// { dg-error "deleted" }
+}
diff --git a/gcc/testsuite/g++.dg/inherit/implicit-trivial1.C b/gcc/testsuite/g++.dg/inherit/implicit-trivial1.C
new file mode 100644
index 0000000..e63bd34
--- /dev/null
+++ b/gcc/testsuite/g++.dg/inherit/implicit-trivial1.C
@@ -0,0 +1,23 @@
+// PR c++/46807
+// { dg-options -std=c++98 }
+// In C++98/03, B::B(const B&) is trivial because A::A(const A&) is trivial,
+// even though doing overload resolution would mean calling the template
+// constructor.  In C++0x, we do overload resolution to determine triviality.
+
+struct A
+{
+  A() {}
+private:
+  template <class T> A(T&);
+};
+
+struct B
+{
+  mutable A a;
+};
+
+int main()
+{
+  B b;
+  B b2(b);
+}