From: Joseph Myers <jsm28@cam.ac.uk>
Date: Mon, 3 Dec 2001 00:09:34 +0000 (+0000)
Subject: c-typeck.c (really_start_incremental_init, [...]): Avoid constructor_max_index being... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=39bc99c26599afa6f3a8bfe0710b11e00b00365b;p=gcc.git

c-typeck.c (really_start_incremental_init, [...]): Avoid constructor_max_index being other than an INTEGER_CST.

	* c-typeck.c (really_start_incremental_init, push_init_level):
	Avoid constructor_max_index being other than an INTEGER_CST.

testsuite:
	* gcc.dg/vla-init-1.c: New test.

From-SVN: r47539
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c10750270ac..12fba08a05d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-03  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+	* c-typeck.c (really_start_incremental_init, push_init_level):
+	Avoid constructor_max_index being other than an INTEGER_CST.
+
 2001-12-02  David Edelsohn  <edelsohn@gnu.org>
 
 	* config/rs6000/xcoff.h (ASM_OUTPUT_INTERNAL_LABEL): Display count
diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index 64f0f07d89a..ff504dc1d05 100644
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -5259,6 +5259,13 @@ really_start_incremental_init (type)
 	      && TYPE_SIZE (constructor_type))
 	    constructor_max_index = build_int_2 (-1, -1);
 
+	  /* constructor_max_index needs to be an INTEGER_CST.  Attempts
+	     to initialize VLAs will cause an proper error; avoid tree
+	     checking errors as well by setting a safe value.  */
+	  if (constructor_max_index
+	      && TREE_CODE (constructor_max_index) != INTEGER_CST)
+	    constructor_max_index = build_int_2 (-1, -1);
+
 	  constructor_index
 	    = convert (bitsizetype,
 		       TYPE_MIN_VALUE (TYPE_DOMAIN (constructor_type)));
@@ -5426,6 +5433,13 @@ push_init_level (implicit)
 	      && TYPE_SIZE (constructor_type))
 	    constructor_max_index = build_int_2 (-1, -1);
 
+	  /* constructor_max_index needs to be an INTEGER_CST.  Attempts
+	     to initialize VLAs will cause an proper error; avoid tree
+	     checking errors as well by setting a safe value.  */
+	  if (constructor_max_index
+	      && TREE_CODE (constructor_max_index) != INTEGER_CST)
+	    constructor_max_index = build_int_2 (-1, -1);
+
 	  constructor_index
 	    = convert (bitsizetype, 
 		       TYPE_MIN_VALUE (TYPE_DOMAIN (constructor_type)));
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d3a4df6b5a1..7f7138990e1 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2001-12-03  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+	* gcc.dg/vla-init-1.c: New test.
+
 2001-12-01  Geoff Keating  <geoffk@redhat.com>
 
 	* gcc.c-torture/compile/structs.c: New testcase from GDB.
diff --git a/gcc/testsuite/gcc.dg/vla-init-1.c b/gcc/testsuite/gcc.dg/vla-init-1.c
new file mode 100644
index 00000000000..61d235752fa
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/vla-init-1.c
@@ -0,0 +1,13 @@
+/* Test for tree-checking error when initializing a variable-length array
+   (not allowed): constructor_max_index needs to be an INTEGER_CST.  */
+/* Origin: Joseph Myers <jsm28@cam.ac.uk>.  */
+/* { dg-do compile } */
+/* { dg-options "" } */
+
+int a;
+
+void
+foo (void)
+{
+  int x[a] = { 1 }; /* { dg-error "init" "VLA init" } */
+}