diff options
| author | Jason Merrill <jason@redhat.com> | 2011-03-17 12:02:08 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-03-17 12:02:08 -0400 |
| commit | 547206a4e530360a06679894c2a9f2168bf5f943 (patch) | |
| tree | 9166f3143170c60730cad42e36802c6c8ee882a2 /gcc | |
| parent | 8054a389725c18d627de6edf1f78dd1881819dd2 (diff) | |
| download | gcc-547206a4e530360a06679894c2a9f2168bf5f943.zip gcc-547206a4e530360a06679894c2a9f2168bf5f943.tar.gz gcc-547206a4e530360a06679894c2a9f2168bf5f943.tar.bz2 | |
re PR c++/48166 (ICE on static member function with invalid type qualifier)
PR c++/48166
* decl.c (revert_static_member_fn): Strip function-cv-quals.
From-SVN: r171103
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 10 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/parse/memfnquals1.C | 6 |
4 files changed, 22 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 7248c11..38ac06c 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2011-03-17 Jason Merrill <jason@redhat.com> + + PR c++/48166 + * decl.c (revert_static_member_fn): Strip function-cv-quals. + 2011-03-16 Jason Merrill <jason@redhat.com> PR c++/48089 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index a7da574..0985749 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -13344,10 +13344,14 @@ static_fn_type (tree memfntype) void revert_static_member_fn (tree decl) { - TREE_TYPE (decl) = static_fn_type (decl); + tree stype = static_fn_type (decl); - if (cp_type_quals (TREE_TYPE (decl)) != TYPE_UNQUALIFIED) - error ("static member function %q#D declared with type qualifiers", decl); + if (type_memfn_quals (stype) != TYPE_UNQUALIFIED) + { + error ("static member function %q#D declared with type qualifiers", decl); + stype = apply_memfn_quals (stype, TYPE_UNQUALIFIED); + } + TREE_TYPE (decl) = stype; if (DECL_ARGUMENTS (decl)) DECL_ARGUMENTS (decl) = DECL_CHAIN (DECL_ARGUMENTS (decl)); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 20ba8d6..47cdbc9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2011-03-17 Jason Merrill <jason@redhat.com> + + * g++.dg/parse/memfnquals1.C: New. + 2011-03-17 Richard Guenther <rguenther@suse.de> PR middle-end/48134 diff --git a/gcc/testsuite/g++.dg/parse/memfnquals1.C b/gcc/testsuite/g++.dg/parse/memfnquals1.C new file mode 100644 index 0000000..ce8af7b --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/memfnquals1.C @@ -0,0 +1,6 @@ +// PR c++/48166 + +struct foo { + static void func (); +}; +void foo::func () const {} // { dg-error "type qualifiers" } |