diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-11-05 09:10:09 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2007-11-05 09:10:09 +0100 |
| commit | 1b021ff438d08470cb72ee3e8e75029bda7989f1 (patch) | |
| tree | 365cb855f056e4fc4a1e9b2febd7ed9503df4555 /gcc | |
| parent | 9656bc0fdc7247299df8a105dff1f49d98f3e184 (diff) | |
| download | gcc-1b021ff438d08470cb72ee3e8e75029bda7989f1.zip gcc-1b021ff438d08470cb72ee3e8e75029bda7989f1.tar.gz gcc-1b021ff438d08470cb72ee3e8e75029bda7989f1.tar.bz2 | |
re PR c++/33969 (ICE with const and function pointer)
PR c++/33969
* decl.c (grokdeclarator): Don't call build_memfn_type if type
is neither FUNCTION_TYPE nor METHOD_TYPE.
* g++.dg/other/ptrmem9.C: New test.
From-SVN: r129895
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/other/ptrmem9.C | 5 |
4 files changed, 18 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 1acce71..5eb1dce 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2007-11-05 Jakub Jelinek <jakub@redhat.com> + + PR c++/33969 + * decl.c (grokdeclarator): Don't call build_memfn_type if type + is neither FUNCTION_TYPE nor METHOD_TYPE. + 2007-11-02 Jakub Jelinek <jakub@redhat.com> PR c++/33516 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 9bab97b..990d943 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -8153,7 +8153,8 @@ grokdeclarator (const cp_declarator *declarator, type_quals = TYPE_UNQUALIFIED; if (declarator->kind == cdk_ptrmem - && (TREE_CODE (type) == FUNCTION_TYPE || memfn_quals)) + && (TREE_CODE (type) == FUNCTION_TYPE + || (memfn_quals && TREE_CODE (type) == METHOD_TYPE))) { memfn_quals |= cp_type_quals (type); type = build_memfn_type (type, diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3c20102..3e6d744 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-11-05 Jakub Jelinek <jakub@redhat.com> + + PR c++/33969 + * g++.dg/other/ptrmem9.C: New test. + 2007-11-04 Andrew Pinski <pinskia@gmail.com> PR middle-end/32931 diff --git a/gcc/testsuite/g++.dg/other/ptrmem9.C b/gcc/testsuite/g++.dg/other/ptrmem9.C new file mode 100644 index 0000000..c4d3656 --- /dev/null +++ b/gcc/testsuite/g++.dg/other/ptrmem9.C @@ -0,0 +1,5 @@ +// PR c++/33969 +// { dg-do compile } + +struct A; +void (*A::* fp)() const; // { dg-error "invalid in variable declaration" } |