diff options
| author | H.J. Lu <hongjiu.lu@intel.com> | 2008-07-27 17:40:04 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl@gcc.gnu.org> | 2008-07-27 10:40:04 -0700 |
| commit | ff60c6685c150b8371d35fb471aebf628e2c1b94 (patch) | |
| tree | bf63c1aa1a17ac9a534c474ad3030bed8db34f11 /gcc/cp/class.c | |
| parent | 330e765e13717fc4a294302419355a393f000428 (diff) | |
| download | gcc-ff60c6685c150b8371d35fb471aebf628e2c1b94.zip gcc-ff60c6685c150b8371d35fb471aebf628e2c1b94.tar.gz gcc-ff60c6685c150b8371d35fb471aebf628e2c1b94.tar.bz2 | |
re PR c++/36944 (Revision 138123 breaks constructors with default arguments)
gcc/cp/
2008-07-27 H.J. Lu <hongjiu.lu@intel.com>
PR c++/36944
* class.c (type_has_user_provided_default_constructor): Handle
default parameters.
gcc/testsuite/
2008-07-27 H.J. Lu <hongjiu.lu@intel.com>
PR c++/36944
* g++.dg/other/pr36944.C: New.
From-SVN: r138194
Diffstat (limited to 'gcc/cp/class.c')
| -rw-r--r-- | gcc/cp/class.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 1820460..f7e46a7 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -4107,7 +4107,7 @@ type_has_user_provided_constructor (tree t) bool type_has_user_provided_default_constructor (tree t) { - tree fns; + tree fns, args; if (!TYPE_HAS_USER_CONSTRUCTOR (t)) return false; @@ -4116,10 +4116,14 @@ type_has_user_provided_default_constructor (tree t) { tree fn = OVL_CURRENT (fns); if (TREE_CODE (fn) == FUNCTION_DECL - && user_provided_p (fn) - && (skip_artificial_parms_for (fn, DECL_ARGUMENTS (fn)) - == NULL_TREE)) - return true; + && user_provided_p (fn)) + { + args = FUNCTION_FIRST_USER_PARMTYPE (fn); + while (args && TREE_PURPOSE (args)) + args = TREE_CHAIN (args); + if (!args || args == void_list_node) + return true; + } } return false; |