From: Jakub Jelinek <jakub@redhat.com>
Date: Fri, 22 Jun 2018 21:07:16 +0000 (+0200)
Subject: backport: re PR c++/85210 (ICE with broken structured binding in template)
X-Git-Tag: releases/gcc-7.4.0~340
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0099aeaa3af0ef6f7b0a565c7818f6a3d6cfd570;p=thirdparty%2Fgcc.git

backport: re PR c++/85210 (ICE with broken structured binding in template)

	Backported from mainline
	2018-04-06  Jakub Jelinek  <jakub@redhat.com>

	PR c++/85210
	* pt.c (tsubst_decomp_names): Return error_mark_node and assert
	errorcount is set if tsubst doesn't return a VAR_DECL.

	* g++.dg/cpp1z/decomp42.C: New test.

From-SVN: r261949
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 6b08634faa20..6700d1edeb53 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,6 +1,12 @@
 2018-06-22  Jakub Jelinek  <jakub@redhat.com>
 
 	Backported from mainline
+	2018-04-06  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/85210
+	* pt.c (tsubst_decomp_names): Return error_mark_node and assert
+	errorcount is set if tsubst doesn't return a VAR_DECL.
+
 	2018-04-05  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/85208
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 5e79bc90af5d..79cfd0129226 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -15804,6 +15804,12 @@ tsubst_decomp_names (tree decl, tree pattern_decl, tree args,
       DECL_HAS_VALUE_EXPR_P (decl2) = 1;
       if (VAR_P (decl3))
 	DECL_TEMPLATE_INSTANTIATED (decl3) = 1;
+      else
+	{
+	  gcc_assert (errorcount);
+	  decl = error_mark_node;
+	  continue;
+	}
       maybe_push_decl (decl3);
       if (error_operand_p (decl3))
 	decl = error_mark_node;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 669b4bed1b72..0fd38c54cbe9 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,6 +1,11 @@
 2018-06-22  Jakub Jelinek  <jakub@redhat.com>
 
 	Backported from mainline
+	2018-04-06  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/85210
+	* g++.dg/cpp1z/decomp42.C: New test.
+
 	2018-04-05  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/85208
diff --git a/gcc/testsuite/g++.dg/cpp1z/decomp42.C b/gcc/testsuite/g++.dg/cpp1z/decomp42.C
new file mode 100644
index 000000000000..22c68ebd3a5e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1z/decomp42.C
@@ -0,0 +1,18 @@
+// PR c++/85210
+// { dg-do compile { target c++11 } }
+// { dg-options "" }
+
+struct A { int i; };
+
+template <int>
+void
+foo (int j)
+{
+  auto [j] = A{j};	// { dg-error "shadows a parameter" }
+}			// { dg-warning "decomposition declaration only available with" "" { target c++14_down } .-1 }
+
+void
+bar ()
+{
+  foo<0> (0);
+}