aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/c-typeck.c3
2 files changed, 6 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fa24164..40a06bb 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-17 Ian Lance Taylor <ian@airs.com>
+
+ PR c/5675
+ * c-typeck.c (build_c_cast): Revert patch of 2003-02-16: don't
+ fold constant variables into initial values.
+
2005-01-17 Kazu Hirata <kazu@cs.umass.edu>
* tree-cfg.c (tree_can_merge_blocks_p): Reorder two checks.
diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index e173c6a..0d7c019 100644
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -3202,9 +3202,6 @@ build_c_cast (tree type, tree expr)
pedwarn ("ISO C forbids conversion of object pointer to function pointer type");
ovalue = value;
- /* Replace a nonvolatile const static variable with its value. */
- if (optimize && TREE_CODE (value) == VAR_DECL)
- value = decl_constant_value (value);
value = convert (type, value);
/* Ignore any integer overflow caused by the cast. */