diff options
| author | Jason Merrill <jason@redhat.com> | 2014-09-05 13:59:40 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2014-09-05 13:59:40 -0400 |
| commit | ed23bf8bd649d2568e7371760841db39c6ac2e63 (patch) | |
| tree | 5802052cd03ae89ce9db8b9ffb7e4f5c7f30e08b /gcc | |
| parent | 01c2fa9d53bee9a6aeeb2b8026081db22c2a66f1 (diff) | |
| download | gcc-ed23bf8bd649d2568e7371760841db39c6ac2e63.zip gcc-ed23bf8bd649d2568e7371760841db39c6ac2e63.tar.gz gcc-ed23bf8bd649d2568e7371760841db39c6ac2e63.tar.bz2 | |
re PR c++/62659 (Regression in template argument substitution in 4.9+)
PR c++/62659
* semantics.c (potential_constant_expression_1): Handle un-folded
pointer to member constants.
From-SVN: r214974
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/ptrmem29.C | 10 |
3 files changed, 21 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index cce5739..3d87231 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2014-09-05 Jason Merrill <jason@redhat.com> + + PR c++/62659 + * semantics.c (potential_constant_expression_1): Handle un-folded + pointer to member constants. + 2014-09-04 Markus Trippelsdorf <markus@trippelsdorf.de> PR ipa/61659 diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index 01748da..776fa26 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -10348,6 +10348,11 @@ potential_constant_expression_1 (tree t, bool want_rval, tsubst_flags_t flags) designates an object with thread or automatic storage duration; */ t = TREE_OPERAND (t, 0); + + if (TREE_CODE (t) == OFFSET_REF && PTRMEM_OK_P (t)) + /* A pointer-to-member constant. */ + return true; + #if 0 /* FIXME adjust when issue 1197 is fully resolved. For now don't do any checking here, as we might dereference the pointer later. If diff --git a/gcc/testsuite/g++.dg/template/ptrmem29.C b/gcc/testsuite/g++.dg/template/ptrmem29.C new file mode 100644 index 0000000..7700c0b --- /dev/null +++ b/gcc/testsuite/g++.dg/template/ptrmem29.C @@ -0,0 +1,10 @@ +// PR c++/62659 + +struct D { + typedef int (D::*cont_func)(); + template <cont_func> struct B; + template <cont_func cont_f> void wait(B<cont_f> ***); + + int done(); + template <bool> void fix() { wait<&D::done>(0); } +}; |