From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 30 May 2017 07:46:27 +0000 (+0200)
Subject: backport: re PR c++/78649 (ICE on invalid C++ code on x86_64-linux-gnu (internal... 
X-Git-Tag: releases/gcc-5.5.0~281
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13e3a0f5445434df86658735465148777b91a6bc;p=thirdparty%2Fgcc.git

backport: re PR c++/78649 (ICE on invalid C++ code on x86_64-linux-gnu (internal compiler error: tree check: expected class ‘type’, have ‘exceptional’ (error_mark) in build_value_init_noctor, at cp/init.c:380))

	Backported from mainline
	2016-12-02  Jakub Jelinek  <jakub@redhat.com>

	PR c++/78649
	* pt.c (tsubst_init): Don't call build_value_init if decl's type
	is error_mark_node.

	* g++.dg/cpp0x/pr78649.C: New test.

From-SVN: r248630
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 75be7eae019c..b0fbf05a9996 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,6 +1,12 @@
 2017-05-30  Jakub Jelinek  <jakub@redhat.com>
 
 	Backported from mainline
+	2016-12-02  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/78649
+	* pt.c (tsubst_init): Don't call build_value_init if decl's type
+	is error_mark_node.
+
 	2016-11-23  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/77739
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 578fa20184bd..a19cc0c46a9c 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -12988,7 +12988,7 @@ tsubst_init (tree init, tree decl, tree args,
 
   init = tsubst_expr (init, args, complain, in_decl, false);
 
-  if (!init)
+  if (!init && TREE_TYPE (decl) != error_mark_node)
     {
       /* If we had an initializer but it
 	 instantiated to nothing,
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 780d457a30c2..303b4ab40254 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,6 +1,11 @@
 2017-05-30  Jakub Jelinek  <jakub@redhat.com>
 
 	Backported from mainline
+	2016-12-02  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/78649
+	* g++.dg/cpp0x/pr78649.C: New test.
+
 	2016-11-28  Jakub Jelinek  <jakub@redhat.com>
 
 	PR fortran/78298
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr78649.C b/gcc/testsuite/g++.dg/cpp0x/pr78649.C
new file mode 100644
index 000000000000..43bcb64f1353
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/pr78649.C
@@ -0,0 +1,16 @@
+// PR c++/78649
+// { dg-do compile { target c++11 } }
+
+template <class> void foo ();
+template <class T, class... U>
+void
+test ()
+{
+  T t (foo<U>...);	// { dg-error "declared void" }
+}
+
+int
+main ()
+{
+  test<void> ();
+}