From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 12 Nov 2007 23:17:18 +0000 (+0000)
Subject: 	PR c++/29225
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=98b3f419bbda73bc2ecfda083013bc6abce670db;p=thirdparty%2Fgcc.git

	PR c++/29225
	* call.c (build_new_op): Call resolve_args before calling
	build_over_call.

	* g++.dg/template/crash72.C: New test.


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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 1cc38952d7cb..1bcad75c1ce7 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-13  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/29225
+	* call.c (build_new_op): Call resolve_args before calling
+	build_over_call.
+
 2007-11-11  Tom Tromey  <tromey@redhat.com>
 
 	PR c++/17577:
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 50ff8b527a77..ecb8858b124f 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -3918,7 +3918,10 @@ build_new_op (enum tree_code code, int flags, tree arg1, tree arg2, tree arg3,
 	  if (overloaded_p)
 	    *overloaded_p = true;
 
-	  result = build_over_call (cand, LOOKUP_NORMAL);
+	  if (resolve_args (arglist) == error_mark_node)
+	    result = error_mark_node;
+	  else
+	    result = build_over_call (cand, LOOKUP_NORMAL);
 	}
       else
 	{
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 167d1702ba09..6bbbe33a2e79 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-13  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/29225
+	* g++.dg/template/crash72.C: New test.
+
 2007-11-12  Eric Botcazou  <ebotcazou@libertysurf.fr>
 
 	* g++.dg/opt/cfg5.C: New test.
diff --git a/gcc/testsuite/g++.dg/template/crash72.C b/gcc/testsuite/g++.dg/template/crash72.C
new file mode 100644
index 000000000000..5ab53656119e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/crash72.C
@@ -0,0 +1,25 @@
+// PR c++/29225
+// { dg-do compile }
+
+template <typename L, typename R> bool operator< (L x, R y);
+struct T { int t (); };
+class S {};
+
+struct U
+{
+   typedef int (T::* M) ();
+   M m;
+
+   bool operator() (S &x)
+   {
+     T a;
+     return (a.*m) < x;	// { dg-error "invalid use of non-static member" }
+   }
+};
+
+void foo (S &x)
+{
+  U m;
+  m.m = &T::t;
+  m (x);
+}