aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2005-11-14 20:07:45 +0000
committerJason Merrill <jason@redhat.com>2005-11-14 20:07:45 +0000
commitb4dff14538fd2e37a31ac23d7be08c409646f893 (patch)
tree47a4a9dd0b3a9124f944303cf55f661076130364 /gcc/cp
parent785e216f5a9b11784ad35fb2bfe54c4ed036cc70 (diff)
PR c++/24580
* method.c (locate_ctor): Skip all artificial parms, not just 'this'. git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@106901 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/method.c4
2 files changed, 9 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5b5e78323a5..6d7260fb3b1 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-14 Jason Merrill <jason@redhat.com>
+
+ PR c++/24580
+ * method.c (locate_ctor): Skip all artificial parms, not just
+ 'this'.
+
2005-11-14 Mark Mitchell <mark@codesourcery.com>
* parser.c (eof_token): Add initializer for ambiguous_p.
diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index 67e42ea1e0e..82f4a363cc2 100644
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -889,7 +889,9 @@ locate_ctor (tree type, void *client ATTRIBUTE_UNUSED)
tree fn = OVL_CURRENT (fns);
tree parms = TYPE_ARG_TYPES (TREE_TYPE (fn));
- if (sufficient_parms_p (TREE_CHAIN (parms)))
+ parms = skip_artificial_parms_for (fn, parms);
+
+ if (sufficient_parms_p (parms))
return fn;
}
return NULL_TREE;