From b6fbfcde5680e4e46950dc0c91a1c37526663371 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Sat, 16 Sep 2017 18:33:01 +0000 Subject: Backported from mainline 2017-06-13 Jakub Jelinek 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. git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@252879 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 7 +++++++ gcc/cp/cp-gimplify.c | 6 ++++-- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/opt/nrv18.C | 12 ++++++++++++ 4 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/opt/nrv18.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index c3d0f47c840..28722366460 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -8,6 +8,13 @@ Complain about t not being a variable if t is OVERLOAD even when processing_template_decl. + 2017-06-13 Jakub Jelinek + + 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-08 Jakub Jelinek PR c/81006 diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c index 65f7ef1b158..f881408b117 100644 --- a/gcc/cp/cp-gimplify.c +++ b/gcc/cp/cp-gimplify.c @@ -1384,7 +1384,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) { @@ -1622,7 +1623,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 02db110fe5e..ff8feeb707f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -6,6 +6,11 @@ PR c++/81154 * g++.dg/gomp/pr81154.C: New test. + 2017-06-13 Jakub Jelinek + + PR c++/80984 + * g++.dg/opt/nrv18.C: New test. + 2017-09-15 Martin Liska Backport from mainline diff --git a/gcc/testsuite/g++.dg/opt/nrv18.C b/gcc/testsuite/g++.dg/opt/nrv18.C new file mode 100644 index 00000000000..92e9bdf3dbc --- /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; +} -- cgit v1.2.3