diff options
| author | Ian Lance Taylor <iant@google.com> | 2008-09-19 22:30:12 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2008-09-19 22:30:12 +0000 |
| commit | acafbcde95f106dafa58c6d9daca16ea3aa93668 (patch) | |
| tree | 1ae404ea64580a3b8bc92fcb342708a000a24684 /gcc | |
| parent | f22b7039d8ad71c2ceaf754087e4e52b18801201 (diff) | |
| download | gcc-acafbcde95f106dafa58c6d9daca16ea3aa93668.zip gcc-acafbcde95f106dafa58c6d9daca16ea3aa93668.tar.gz gcc-acafbcde95f106dafa58c6d9daca16ea3aa93668.tar.bz2 | |
varasm.c (narrowing_initializer_constant_valid_p): Return NULL_TREE if ENDTYPE is not an integer.
* varasm.c (narrowing_initializer_constant_valid_p): Return
NULL_TREE if ENDTYPE is not an integer.
From-SVN: r140502
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/varasm.c | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index efb7428..2c39599 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2008-09-19 Ian Lance Taylor <iant@google.com> + + * varasm.c (narrowing_initializer_constant_valid_p): Return + NULL_TREE if ENDTYPE is not an integer. + 2008-09-19 Andrew Pinski <andrew_pinski@playstation.sony.com> PR tree-opt/30930 diff --git a/gcc/varasm.c b/gcc/varasm.c index e74adae..b3f9990 100644 --- a/gcc/varasm.c +++ b/gcc/varasm.c @@ -4064,9 +4064,10 @@ constructor_static_from_elts_p (const_tree ctor) } /* A subroutine of initializer_constant_valid_p. VALUE is either a - MINUS_EXPR or a POINTER_PLUS_EXPR, and ENDTYPE is a narrowing - conversion to something smaller than a pointer. This returns - null_pointer_node if the resulting value is an absolute constant + MINUS_EXPR or a POINTER_PLUS_EXPR. This looks for cases of VALUE + which are valid when ENDTYPE is an integer of any size; in + particular, this does not accept a pointer minus a constant. This + returns null_pointer_node if the VALUE is an absolute constant which can be used to initialize a static variable. Otherwise it returns NULL. */ @@ -4075,6 +4076,9 @@ narrowing_initializer_constant_valid_p (tree value, tree endtype) { tree op0, op1; + if (!INTEGRAL_TYPE_P (endtype)) + return NULL_TREE; + op0 = TREE_OPERAND (value, 0); op1 = TREE_OPERAND (value, 1); |