diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2015-10-29 13:12:45 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2015-10-29 13:12:45 +0000 |
| commit | f58b8cd70ec2c2a6affed7de996d266998352322 (patch) | |
| tree | c5f8fdf72661f4b38ac0df96db69c144f05c6a87 /gcc | |
| parent | 5148d2e38fa5ff6427fca48cb592ca34a46af3f9 (diff) | |
| download | gcc-f58b8cd70ec2c2a6affed7de996d266998352322.zip gcc-f58b8cd70ec2c2a6affed7de996d266998352322.tar.gz gcc-f58b8cd70ec2c2a6affed7de996d266998352322.tar.bz2 | |
re PR c++/67845 (ICE on invalid use of const qualifier on x86_64-linux-gnu in merge_types, at cp/typeck.c:854)
/cp
2015-10-29 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/67845
* decl.c (grokfndecl): In case of erroneous cv-qualified non-member
functions consistently reset TREE_TYPE (decl) too.
/testsuite
2015-10-29 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/67845
* g++.dg/other/cv_func4.C: New.
From-SVN: r229523
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/other/cv_func4.C | 6 |
4 files changed, 22 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index d4c9a4f..a85166b 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2015-10-29 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/67845 + * decl.c (grokfndecl): In case of erroneous cv-qualified non-member + functions consistently reset TREE_TYPE (decl) too. + 2015-10-28 Jason Merrill <jason@redhat.com> DR 1518 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 2fb923f..c5ceb5a 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -7998,6 +7998,11 @@ grokfndecl (tree ctype, DECL_EXTERNAL (decl) = 1; if (TREE_CODE (type) == FUNCTION_TYPE) { + if (quals || rqual) + TREE_TYPE (decl) = apply_memfn_quals (TREE_TYPE (decl), + TYPE_UNQUALIFIED, + REF_QUAL_NONE); + if (quals) { error (ctype diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8c3f4ad..77a736f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-10-29 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/67845 + * g++.dg/other/cv_func4.C: New. + 2015-10-29 Richard Biener <rguenther@suse.de> PR middle-end/56956 diff --git a/gcc/testsuite/g++.dg/other/cv_func4.C b/gcc/testsuite/g++.dg/other/cv_func4.C new file mode 100644 index 0000000..df4f19e --- /dev/null +++ b/gcc/testsuite/g++.dg/other/cv_func4.C @@ -0,0 +1,6 @@ +// PR c++/67845 + +typedef void F () const; + +F foo; // { dg-error "cv-qualifier" } +void foo (); |