From: DJ Delorie <dj@redhat.com>
Date: Mon, 24 Sep 2001 20:27:06 +0000 (-0400)
Subject: * varasm.c (array_size_for_constructor): Handle STRING_CSTs also.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b6fc711089add2bbefb23eecea0eccb3423e9960;p=gcc.git

* varasm.c (array_size_for_constructor): Handle STRING_CSTs also.

From-SVN: r45785
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 64200d65d74..b5c46950ebd 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-24  DJ Delorie  <dj@redhat.com>
+
+	* varasm.c (array_size_for_constructor): Handle STRING_CSTs also.
+
 2001-09-24  Ulrich Weigand  <uweigand@de.ibm.com>:
 
 	* flow.c (delete_dead_jumptables): Delete jumptable if the only
diff --git a/gcc/varasm.c b/gcc/varasm.c
index 9230fcf173b..68c51655c36 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -4585,6 +4585,13 @@ array_size_for_constructor (val)
 {
   tree max_index, i;
 
+  if (TREE_CODE (val) == STRING_CST)
+    {
+      HOST_WIDE_INT len = TREE_STRING_LENGTH(val);
+      HOST_WIDE_INT esz = int_size_in_bytes (TREE_TYPE (TREE_TYPE (val)));
+      HOST_WIDE_INT tsz = len * esz;
+      return tsz;
+    }
   max_index = NULL_TREE;
   for (i = CONSTRUCTOR_ELTS (val); i ; i = TREE_CHAIN (i))
     {