diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2017-06-13 22:02:38 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2017-06-13 22:02:38 +0200 |
| commit | c60dc05326dbf6960dbaa898db854fd062afeecd (patch) | |
| tree | 4ad7f49cb5b7a62ef3ce69d6f77d52c239c2b228 | |
| parent | e2fea9319edd5ccd8e94f8b2c6fd3c7061b923fa (diff) | |
| download | gcc-c60dc05326dbf6960dbaa898db854fd062afeecd.zip gcc-c60dc05326dbf6960dbaa898db854fd062afeecd.tar.gz gcc-c60dc05326dbf6960dbaa898db854fd062afeecd.tar.bz2 | |
re PR c++/80984 (ICE with label/variable ambiguity)
PR c++/80984
* cp-gimplify.c (cp_genericize): Only look for VAR_DECLs in
BLOCK_VARS (outer) chain.
(cxx_omp_const_qual_no_mutable): Likewise.
* g++.dg/opt/nrv18.C: New test.
From-SVN: r249173
| -rw-r--r-- | gcc/cp/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/cp/cp-gimplify.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/opt/nrv18.C | 12 |
4 files changed, 28 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 4388830..ae91a9d 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2017-06-13 Jakub Jelinek <jakub@redhat.com> + + PR c++/80984 + * cp-gimplify.c (cp_genericize): Only look for VAR_DECLs in + BLOCK_VARS (outer) chain. + (cxx_omp_const_qual_no_mutable): Likewise. + 2017-06-13 Martin Liska <mliska@suse.cz> PR sanitize/78204 diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c index 3c8f4b0..d546208 100644 --- a/gcc/cp/cp-gimplify.c +++ b/gcc/cp/cp-gimplify.c @@ -1590,7 +1590,8 @@ cp_genericize (tree fndecl) if (outer) for (var = BLOCK_VARS (outer); var; var = DECL_CHAIN (var)) - if (DECL_NAME (t) == DECL_NAME (var) + if (VAR_P (var) + && DECL_NAME (t) == DECL_NAME (var) && DECL_HAS_VALUE_EXPR_P (var) && DECL_VALUE_EXPR (var) == t) { @@ -1836,7 +1837,8 @@ cxx_omp_const_qual_no_mutable (tree decl) if (outer) for (var = BLOCK_VARS (outer); var; var = DECL_CHAIN (var)) - if (DECL_NAME (decl) == DECL_NAME (var) + if (VAR_P (var) + && DECL_NAME (decl) == DECL_NAME (var) && (TYPE_MAIN_VARIANT (type) == TYPE_MAIN_VARIANT (TREE_TYPE (var)))) { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1eddf49..5164fa9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-06-13 Jakub Jelinek <jakub@redhat.com> + + PR c++/80984 + * g++.dg/opt/nrv18.C: New test. + 2017-06-13 Martin Liska <mliska@suse.cz> PR sanitize/78204 diff --git a/gcc/testsuite/g++.dg/opt/nrv18.C b/gcc/testsuite/g++.dg/opt/nrv18.C new file mode 100644 index 0000000..92e9bdf --- /dev/null +++ b/gcc/testsuite/g++.dg/opt/nrv18.C @@ -0,0 +1,12 @@ +// PR c++/80984 +// { dg-do compile } + +struct A { ~A (); }; + +A +foo () +{ + A a; +a: + return a; +} |