diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/call.c | 10 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/other/default6.C | 18 |
4 files changed, 35 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index acc64352947..ccbb842d2fe 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2007-03-12 Mark Mitchell <mark@codesourcery.com> + + PR c++/30108 + * call.c (convert_default_arg): Copy non-constant arguments. + 2007-03-11 Mark Mitchell <mark@codesourcery.com> PR c++/31038 diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 637671bc1bc..00e0c063e86 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -4664,10 +4664,14 @@ convert_default_arg (tree type, tree arg, tree fn, int parmnum) } else { - /* This could get clobbered by the following call. */ - if (TREE_HAS_CONSTRUCTOR (arg)) + /* We must make a copy of ARG, in case subsequent processing + alters any part of it. For example, during gimplification a + cast of the form (T) &X::f (where "f" is a member function) + will lead to replacing the PTRMEM_CST for &X::f with a + VAR_DECL. We can avoid the copy for constants, since they + are never modified in place. */ + if (!CONSTANT_CLASS_P (arg)) arg = copy_node (arg); - arg = convert_for_initialization (0, type, arg, LOOKUP_NORMAL, "default argument", fn, parmnum); arg = convert_for_arg_passing (type, arg); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2c3f7d8dcb4..9d0a8df6333 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-03-12 Mark Mitchell <mark@codesourcery.com> + + PR c++/30108 + * g++.dg/other/default6.C: New test. + 2007-03-12 Richard Sandiford <richard@codesourcery.com> * lib/target-supports.exp (check_profiling_available): Return false diff --git a/gcc/testsuite/g++.dg/other/default6.C b/gcc/testsuite/g++.dg/other/default6.C new file mode 100644 index 00000000000..2641801b1e4 --- /dev/null +++ b/gcc/testsuite/g++.dg/other/default6.C @@ -0,0 +1,18 @@ +// PR c++/30108 + +class BaseRobot { + typedef void (BaseRobot::*PseudoState)(void); + typedef PseudoState STATE; + STATE initial (); + int ready (); + STATE stpOtherTask (); + STATE commonEventProcessing (STATE pIdleTarget=(STATE)&BaseRobot::ready); +}; +BaseRobot::STATE BaseRobot::initial () +{ + return commonEventProcessing (); +} +BaseRobot::STATE BaseRobot::stpOtherTask () +{ + return commonEventProcessing (); +} |
