* [Ada] Fix internal error on instance of Ada.Task_Attributes at -O
@ 2022-07-13 10:03 Pierre-Marie de Rodat
0 siblings, 0 replies; only message in thread
From: Pierre-Marie de Rodat @ 2022-07-13 10:03 UTC (permalink / raw)
To: gcc-patches; +Cc: Eric Botcazou
[-- Attachment #1: Type: text/plain, Size: 262 bytes --]
This happens when there is a size mismatch, but this must be accepted.
Tested on x86_64-pc-linux-gnu, committed on trunk
gcc/ada/
* gcc-interface/utils.cc (unchecked_convert): Also pad in most cases
if the source is not a scalar type but the destination is.
[-- Attachment #2: patch.diff --]
[-- Type: text/x-diff, Size: 2640 bytes --]
diff --git a/gcc/ada/gcc-interface/utils.cc b/gcc/ada/gcc-interface/utils.cc
--- a/gcc/ada/gcc-interface/utils.cc
+++ b/gcc/ada/gcc-interface/utils.cc
@@ -5503,8 +5503,8 @@ unchecked_convert (tree type, tree expr, bool notrunc_p)
expr = unchecked_convert (type, expr, notrunc_p);
}
- /* If we are converting from a scalar type to a type with a different size,
- we need to pad to have the same size on both sides.
+ /* If we are converting between fixed-size types with different sizes, we
+ need to pad to have the same size on both sides.
??? We cannot do it unconditionally because unchecked conversions are
used liberally by the front-end to implement interface thunks:
@@ -5515,8 +5515,10 @@ unchecked_convert (tree type, tree expr, bool notrunc_p)
so we need to skip dereferences. */
else if (!INDIRECT_REF_P (expr)
- && !AGGREGATE_TYPE_P (etype)
+ && TREE_CODE (expr) != STRING_CST
+ && !(AGGREGATE_TYPE_P (etype) && AGGREGATE_TYPE_P (type))
&& ecode != UNCONSTRAINED_ARRAY_TYPE
+ && TREE_CONSTANT (TYPE_SIZE (etype))
&& TREE_CONSTANT (TYPE_SIZE (type))
&& (c = tree_int_cst_compare (TYPE_SIZE (etype), TYPE_SIZE (type))))
{
@@ -5532,15 +5534,18 @@ unchecked_convert (tree type, tree expr, bool notrunc_p)
tree rec_type = maybe_pad_type (type, TYPE_SIZE (etype), 0, Empty,
false, false, true);
expr = unchecked_convert (rec_type, expr, notrunc_p);
- expr = build_component_ref (expr, TYPE_FIELDS (rec_type), false);
+ expr = build3 (COMPONENT_REF, type, expr, TYPE_FIELDS (rec_type),
+ NULL_TREE);
}
}
- /* Likewise if we are converting from a scalar type to a type with self-
+ /* Likewise if we are converting from a fixed-szie type to a type with self-
referential size. We use the max size to do the padding in this case. */
else if (!INDIRECT_REF_P (expr)
- && !AGGREGATE_TYPE_P (etype)
+ && TREE_CODE (expr) != STRING_CST
+ && !(AGGREGATE_TYPE_P (etype) && AGGREGATE_TYPE_P (type))
&& ecode != UNCONSTRAINED_ARRAY_TYPE
+ && TREE_CONSTANT (TYPE_SIZE (etype))
&& CONTAINS_PLACEHOLDER_P (TYPE_SIZE (type)))
{
tree new_size = max_size (TYPE_SIZE (type), true);
@@ -5557,7 +5562,8 @@ unchecked_convert (tree type, tree expr, bool notrunc_p)
tree rec_type = maybe_pad_type (type, TYPE_SIZE (etype), 0, Empty,
false, false, true);
expr = unchecked_convert (rec_type, expr, notrunc_p);
- expr = build_component_ref (expr, TYPE_FIELDS (rec_type), false);
+ expr = build3 (COMPONENT_REF, type, expr, TYPE_FIELDS (rec_type),
+ NULL_TREE);
}
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-07-13 10:03 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-13 10:03 [Ada] Fix internal error on instance of Ada.Task_Attributes at -O Pierre-Marie de Rodat
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).