aboutsummaryrefslogtreecommitdiff
path: root/gcc/ada/gcc-interface/trans.c
diff options
context:
space:
mode:
authorEric Botcazou <ebotcazou@adacore.com>2021-05-21 10:40:41 +0200
committerEric Botcazou <ebotcazou@adacore.com>2021-05-21 10:41:35 +0200
commit1e66a9170071aded59dda09ac437757de4223346 (patch)
treeac2134904482b8c750c41ae164382aaad5c37a23 /gcc/ada/gcc-interface/trans.c
parentf1c777f40aa0b6941efc7440495a8d7e0cc2a1bb (diff)
downloadgcc-1e66a9170071aded59dda09ac437757de4223346.zip
gcc-1e66a9170071aded59dda09ac437757de4223346.tar.gz
gcc-1e66a9170071aded59dda09ac437757de4223346.tar.bz2
Fix segfault at run time on strict-alignment platforms
This fixes a regression present on the mainline and 11 branch by restricting the problematic change dealing with bitfields whose nomimal subtype is self-referential to the cases where the size is really lower. gcc/ada/ * gcc-interface/trans.c (Call_to_gnu): Restrict previous change to bitfields whose size is not equal to the type size. (gnat_to_gnu): Likewise.
Diffstat (limited to 'gcc/ada/gcc-interface/trans.c')
-rw-r--r--gcc/ada/gcc-interface/trans.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c
index 8ce0d8a..adbbbb1 100644
--- a/gcc/ada/gcc-interface/trans.c
+++ b/gcc/ada/gcc-interface/trans.c
@@ -4611,6 +4611,8 @@ Call_to_gnu (Node_Id gnat_node, tree *gnu_result_type_p, tree gnu_target,
|| (gnu_target
&& TREE_CODE (gnu_target) == COMPONENT_REF
&& DECL_BIT_FIELD (TREE_OPERAND (gnu_target, 1))
+ && DECL_SIZE (TREE_OPERAND (gnu_target, 1))
+ != TYPE_SIZE (TREE_TYPE (gnu_target))
&& type_is_padding_self_referential (gnu_result_type))))
{
gnu_retval = create_temporary ("R", gnu_result_type);
@@ -8370,7 +8372,9 @@ gnat_to_gnu (Node_Id gnat_node)
much data. But do not remove it if it is already too small. */
if (type_is_padding_self_referential (TREE_TYPE (gnu_result))
&& !(TREE_CODE (gnu_result) == COMPONENT_REF
- && DECL_BIT_FIELD (TREE_OPERAND (gnu_result, 1))))
+ && DECL_BIT_FIELD (TREE_OPERAND (gnu_result, 1))
+ && DECL_SIZE (TREE_OPERAND (gnu_result, 1))
+ != TYPE_SIZE (TREE_TYPE (gnu_result))))
gnu_result = convert (TREE_TYPE (TYPE_FIELDS (TREE_TYPE (gnu_result))),
gnu_result);
}