diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2012-04-03 07:11:25 +0000 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@adacore.com> | 2012-04-03 07:11:25 +0000 |
| commit | 9782bb1f59f48ef0b006026a435c34d3b6080249 (patch) | |
| tree | 04901eeaa9d8ac54f5ff6b1fa3f4f9265e4ff0a4 /gcc/varasm.c | |
| parent | a13fc55f1bd8045a5213e46ffcce0501bb852383 (diff) | |
* varasm.c (initializer_constant_valid_for_bitfield_p): Return true
for REAL_CST as well.
(output_constructor): Use RECORD_OR_UNION_TYPE_P predicate.
In the bitfield case, if the value is a REAL_CST, convert it first to
an INTEGER_CST.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@186100 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/varasm.c')
| -rw-r--r-- | gcc/varasm.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/gcc/varasm.c b/gcc/varasm.c index 0c04de47974..34ed948cade 100644 --- a/gcc/varasm.c +++ b/gcc/varasm.c @@ -4420,6 +4420,7 @@ initializer_constant_valid_for_bitfield_p (tree value) } case INTEGER_CST: + case REAL_CST: return true; case VIEW_CONVERT_EXPR: @@ -5075,10 +5076,7 @@ output_constructor (tree exp, unsigned HOST_WIDE_INT size, /* The element in a union constructor specifies the proper field or index. */ - if ((TREE_CODE (local.type) == RECORD_TYPE - || TREE_CODE (local.type) == UNION_TYPE - || TREE_CODE (local.type) == QUAL_UNION_TYPE) - && ce->index != NULL_TREE) + if (RECORD_OR_UNION_TYPE_P (local.type) && ce->index != NULL_TREE) local.field = ce->index; else if (TREE_CODE (local.type) == ARRAY_TYPE) @@ -5110,9 +5108,18 @@ output_constructor (tree exp, unsigned HOST_WIDE_INT size, || !CONSTRUCTOR_BITFIELD_P (local.field))) output_constructor_regular_field (&local); - /* For a true bitfield or part of an outer one. */ + /* For a true bitfield or part of an outer one. Only INTEGER_CSTs are + supported for scalar fields, so we may need to convert first. */ else - output_constructor_bitfield (&local, outer); + { + if (TREE_CODE (local.val) == REAL_CST) + local.val + = fold_unary (VIEW_CONVERT_EXPR, + build_nonstandard_integer_type + (TYPE_PRECISION (TREE_TYPE (local.val)), 0), + local.val); + output_constructor_bitfield (&local, outer); + } } /* If we are not at toplevel, save the pending data for our caller. |