aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorVolker Reichelt <reichelt@igpm.rwth-aachen.de>2006-05-11 14:41:03 +0000
committerVolker Reichelt <reichelt@gcc.gnu.org>2006-05-11 14:41:03 +0000
commit80cdd94a6c80c6686d39660df2234ad9e9b31ce2 (patch)
treeae8d1f873eb329b0c27f14d31b977e3c4754a332 /gcc/cp
parentc6c097b26c6253477bc44a55a0dddae5c72d022f (diff)
downloadgcc-80cdd94a6c80c6686d39660df2234ad9e9b31ce2.zip
gcc-80cdd94a6c80c6686d39660df2234ad9e9b31ce2.tar.gz
gcc-80cdd94a6c80c6686d39660df2234ad9e9b31ce2.tar.bz2
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: r113696
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/decl.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a357204..898c13f 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>
PR c++/27447
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 057c1fb..1b5e41d 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -8818,7 +8818,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 (TREE_CODE (d) == TEMPLATE_DECL
|| (DECL_TEMPLATE_INFO (d)