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: r249509

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a3cd5f1983cbae4d8ee88fa08c52b7fb95a13d09..c6a5748f54831585a96d78646967d721cd054077 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,13 @@
+2017-06-22  Jakub Jelinek  <jakub@redhat.com>
+
+       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.
+
 2017-06-17  Jason Merrill  <jason@redhat.com>
 
        PR c++/70844 - -Wuseless-cast and inheriting constructor.

diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c
index 9266b6a3df3b82310323b0ec6bfa4740779b806f..b3658860e11105cbe8194bb53cd3ff8e3d1e9f81 100644 (file)
--- a/gcc/cp/cp-gimplify.c
+++ b/gcc/cp/cp-gimplify.c
@@ -1566,7 +1566,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)
                {
@@ -1813,7 +1814,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 671483dfcce6ddea2c565d40e7e2b4f5db473d4a..2c0c22e99a3fb6068e9f3e0e160dad52bc580d99 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,6 +1,11 @@
 2017-06-22  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline
+       2017-06-13  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c++/80984
+       * g++.dg/opt/nrv18.C: New test.
+
        2017-06-02  Jakub Jelinek  <jakub@redhat.com>
 
        PR fortran/80918

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;
+}