backport: re PR c++/80984 (ICE with label/variable ambiguity)

	Backported from mainline
	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.

	* g++.dg/opt/nrv18.C: New test.

From-SVN: r252879

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c3d0f47c840e48a18efd3412d4e0621cb668f1fa..28722366460efab59b28220ebc96bf3ff6260443 100644 (file)
--- 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  <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-08  Jakub Jelinek  <jakub@redhat.com>
 
        PR c/81006

diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c
index 65f7ef1b15883f5f23c519eef7e269690df41f90..f881408b117de4bd0231a61a351f588b619bfb6b 100644 (file)
--- 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 02db110fe5e40cb3f19880621aeaa8fb11c60c77..ff8feeb707f30b8e62c1b57bb72e68846725bc9d 100644 (file)
--- 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  <jakub@redhat.com>
+
+       PR c++/80984
+       * g++.dg/opt/nrv18.C: New test.
+
 2017-09-15  Martin Liska  <mliska@suse.cz>
 
        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 (file)
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;
+}