diff options
Diffstat (limited to 'gcc/ada/utils.c')
| -rw-r--r-- | gcc/ada/utils.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/gcc/ada/utils.c b/gcc/ada/utils.c index 6b44189f7d0..4390b00eed1 100644 --- a/gcc/ada/utils.c +++ b/gcc/ada/utils.c @@ -668,10 +668,10 @@ finish_record_type (tree record_type, tree fieldlist, bool has_rep, TYPE_MODE (record_type) = BLKmode; if (!had_size_unit) - TYPE_SIZE_UNIT (record_type) = size_zero_node; - + TYPE_SIZE_UNIT (record_type) = size_zero_node; if (!had_size) TYPE_SIZE (record_type) = bitsize_zero_node; + /* For all-repped records with a size specified, lay the QUAL_UNION_TYPE out just like a UNION_TYPE, since the size will be fixed. */ else if (code == QUAL_UNION_TYPE) @@ -796,9 +796,11 @@ finish_record_type (tree record_type, tree fieldlist, bool has_rep, : convert (sizetype, size_binop (CEIL_DIV_EXPR, size, bitsize_unit_node))); - TYPE_SIZE (record_type) = round_up (size, TYPE_ALIGN (record_type)); + TYPE_SIZE (record_type) + = variable_size (round_up (size, TYPE_ALIGN (record_type))); TYPE_SIZE_UNIT (record_type) - = round_up (size_unit, TYPE_ALIGN (record_type) / BITS_PER_UNIT); + = variable_size (round_up (size_unit, + TYPE_ALIGN (record_type) / BITS_PER_UNIT)); compute_record_mode (record_type); } @@ -2919,10 +2921,13 @@ convert (tree type, tree expr) { if (TREE_TYPE (tem) == etype) return build1 (CONVERT_EXPR, type, expr); - else if (TREE_CODE (TREE_TYPE (tem)) == RECORD_TYPE - && (TYPE_JUSTIFIED_MODULAR_P (TREE_TYPE (tem)) - || TYPE_IS_PADDING_P (TREE_TYPE (tem))) - && TREE_TYPE (TYPE_FIELDS (TREE_TYPE (tem))) == etype) + + /* Accept slight type variations. */ + if (TREE_TYPE (tem) == TYPE_MAIN_VARIANT (etype) + || (TREE_CODE (TREE_TYPE (tem)) == RECORD_TYPE + && (TYPE_JUSTIFIED_MODULAR_P (TREE_TYPE (tem)) + || TYPE_IS_PADDING_P (TREE_TYPE (tem))) + && TREE_TYPE (TYPE_FIELDS (TREE_TYPE (tem))) == etype)) return build1 (CONVERT_EXPR, type, convert (TREE_TYPE (tem), expr)); } |