aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/c-common.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a5ea729..c3655b7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+Wed Aug 25 14:00:18 1999 Jason Merrill <jason@yorick.cygnus.com>
+
+ * c-common.c (combine_strings): Always set TREE_CONSTANT.
+
Wed Aug 25 15:27:22 1999 Gavin Romig-Koch <gavin@cygnus.com>
* combine.c (nonzero_bits) : Allow single-ly set registers to be
diff --git a/gcc/c-common.c b/gcc/c-common.c
index bcf2210..217f32d 100644
--- a/gcc/c-common.c
+++ b/gcc/c-common.c
@@ -420,7 +420,8 @@ combine_strings (strings)
= build_array_type (wide_flag ? wchar_type_node : char_type_node,
build_index_type (build_int_2 (nchars - 1, 0)));
- TREE_READONLY (value) = TREE_CONSTANT (value) = ! flag_writable_strings;
+ TREE_CONSTANT (value) = 1;
+ TREE_READONLY (value) = ! flag_writable_strings;
TREE_STATIC (value) = 1;
return value;
}