diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-10-30 23:37:53 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2007-10-30 23:37:53 +0100 |
| commit | 4c38e99eb4137eab7acfed72c434d8667051372e (patch) | |
| tree | 35889fcd498e973528992ca5eaf197da7f41f266 | |
| parent | e1332188a4c377db70d82b8e6a5df3961b1a4499 (diff) | |
| download | gcc-4c38e99eb4137eab7acfed72c434d8667051372e.zip gcc-4c38e99eb4137eab7acfed72c434d8667051372e.tar.gz gcc-4c38e99eb4137eab7acfed72c434d8667051372e.tar.bz2 | |
re PR c++/33616 ("lvalue required as unary '&' operand" with template pmf)
PR c++/33616
* decl2.c (build_offset_ref_call_from_tree): Call
build_non_dependent_expr on object prior to building ADDR_EXPR from it
if FN is DOTSTAR_EXPR.
* g++.dg/template/ptrmem18.C: New test.
From-SVN: r129784
| -rw-r--r-- | gcc/cp/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/cp/decl2.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/ptrmem18.C | 49 |
4 files changed, 62 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index d5b73e7..5e2447f 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2007-10-30 Jakub Jelinek <jakub@redhat.com> + + PR c++/33616 + * decl2.c (build_offset_ref_call_from_tree): Call + build_non_dependent_expr on object prior to building ADDR_EXPR from it + if FN is DOTSTAR_EXPR. + 2007-10-30 Douglas Gregor <doug.gregor@gmail.com> PR c++/31993 diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index 0a97834..db0d9f3 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -3499,9 +3499,9 @@ build_offset_ref_call_from_tree (tree fn, tree args) parameter. That must be done before the FN is transformed because we depend on the form of FN. */ args = build_non_dependent_args (args); + object = build_non_dependent_expr (object); if (TREE_CODE (fn) == DOTSTAR_EXPR) object = build_unary_op (ADDR_EXPR, object, 0); - object = build_non_dependent_expr (object); args = tree_cons (NULL_TREE, object, args); /* Now that the arguments are done, transform FN. */ fn = build_non_dependent_expr (fn); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5a266ce..4fcafd0 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-10-30 Jakub Jelinek <jakub@redhat.com> + + PR c++/33616 + * g++.dg/template/ptrmem18.C: New test. + 2007-10-30 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> PR fortran/33596 diff --git a/gcc/testsuite/g++.dg/template/ptrmem18.C b/gcc/testsuite/g++.dg/template/ptrmem18.C new file mode 100644 index 0000000..c3124cd --- /dev/null +++ b/gcc/testsuite/g++.dg/template/ptrmem18.C @@ -0,0 +1,49 @@ +// PR c++/33616 +// { dg-do run } +// { dg-options "-O2" } + +extern "C" void abort (); + +struct S { + int c; + S () : c (0) {} + virtual void f1 () { c += 1; } + virtual void f2 () { c += 16; } +}; + +struct T { + S s; +}; + +typedef void (S::*Q) (); + +template <Q P> +void test1 (T *t) +{ + (t->s.*P)(); +} + +template <Q P> +void test2 (T *t) +{ + S &s = t->s; + (s.*P)(); +} + +int +main () +{ + T t; + test1 <&S::f1> (&t); + if (t.s.c != 1) + abort (); + test1 <&S::f2> (&t); + if (t.s.c != 17) + abort (); + test2 <&S::f1> (&t); + if (t.s.c != 18) + abort (); + test2 <&S::f2> (&t); + if (t.s.c != 34) + abort (); +} |