From: Jason Merrill <jason@redhat.com>
Date: Thu, 7 Sep 2023 09:15:01 +0000 (-0400)
Subject: c++: ICE with -fno-exceptions and array init [PR107198]
X-Git-Tag: basepoints/gcc-15~6232
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ea5abbb263315e558c876b50c9371b90ddd5e028;p=thirdparty%2Fgcc.git

c++: ICE with -fno-exceptions and array init [PR107198]

The removed line no longer has an effect on anew5.C error recovery, and
removing it improves error recovery for this testcase.

	PR c++/107198

gcc/cp/ChangeLog:

	* typeck2.cc (process_init_constructor_array): Use VEC_INIT_EXPR
	regardless of seen_error.

gcc/testsuite/ChangeLog:

	* g++.dg/eh/no-exceptions1.C: New test.
---

diff --git a/gcc/cp/typeck2.cc b/gcc/cp/typeck2.cc
index 582a73bb053d..cd1ea045720d 100644
--- a/gcc/cp/typeck2.cc
+++ b/gcc/cp/typeck2.cc
@@ -1683,7 +1683,6 @@ process_init_constructor_array (tree type, tree init, int nested, int flags,
 	if (next)
 	  {
 	    if (next != error_mark_node
-		&& ! seen_error () // Improves error-recovery on anew5.C.
 		&& (initializer_constant_valid_p (next, TREE_TYPE (next))
 		    != null_pointer_node))
 	      {
diff --git a/gcc/testsuite/g++.dg/eh/no-exceptions1.C b/gcc/testsuite/g++.dg/eh/no-exceptions1.C
new file mode 100644
index 000000000000..4b77064c6469
--- /dev/null
+++ b/gcc/testsuite/g++.dg/eh/no-exceptions1.C
@@ -0,0 +1,19 @@
+// PR c++/107198
+// { dg-additional-options -fno-exceptions }
+
+struct A {
+  A() { throw 0; }		// { dg-error disabled }
+  A(int i) { throw i; }
+  A(const A&) { throw 10; }
+};
+
+void try_idx (int i)
+{
+  int t = 10;
+  try {
+    struct X {
+      A e1[2], e2;
+    }
+    x2[3] = { { 1, 2, 3 }, { 4, 5, 6 } };
+  } catch (int x) { t = x; }	// { dg-prune-output "not declared" }
+}