From: Volker Reichelt <reichelt@igpm.rwth-aachen.de>
Date: Thu, 11 May 2006 14:49:17 +0000 (+0000)
Subject: re PR c++/27547 (ICE on invalid operator=)
X-Git-Tag: releases/gcc-4.0.4~704
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b86f1389914440a394c2c9b2d905ae44dba4ed3e;p=thirdparty%2Fgcc.git

re PR c++/27547 (ICE on invalid operator=)

	PR c++/27547
	* decl.c (copy_fn_p): Return early on non-member functions.

	* g++.dg/other/operator1.C: New test.

From-SVN: r113698
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index cc1cbddd15b6..26fa4eea0ed5 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-11  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	PR c++/27547
+	* decl.c (copy_fn_p): Return early on non-member functions.
+
 2006-05-08  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
 	* decl.c (grok_op_properties): Add missing return value.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 7828dfee0536..6bb0911824b3 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -8476,7 +8476,9 @@ copy_fn_p (tree d)
   tree arg_type;
   int result = 1;
 
-  gcc_assert (DECL_FUNCTION_MEMBER_P (d));
+  if (!DECL_FUNCTION_MEMBER_P (d))
+    /* Non-members are invalid.  We complained, but kept the declaration.  */
+    return 0;
 
   if (DECL_TEMPLATE_INFO (d) 
       && DECL_MEMBER_TEMPLATE_P (DECL_TI_TEMPLATE (d)))
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 97da8e57a636..a15879b6a17d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-11  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	PR c++/27547
+	* g++.dg/other/operator1.C: New test.
+
 2006-05-09  Richard Guenther  <rguenther@suse.de>
 
 	PR tree-optimization/27136
diff --git a/gcc/testsuite/g++.dg/other/operator1.C b/gcc/testsuite/g++.dg/other/operator1.C
new file mode 100644
index 000000000000..2769d25efba2
--- /dev/null
+++ b/gcc/testsuite/g++.dg/other/operator1.C
@@ -0,0 +1,9 @@
+// PR c++/27547
+// { dg-do compile }
+
+int operator=(int);  // { dg-error "member function|two arguments" }
+
+void foo()
+{
+  operator=(0);
+}