* [Ada] Fix memory corruption with vector and variant record
@ 2020-06-23 16:33 Eric Botcazou
0 siblings, 0 replies; only message in thread
From: Eric Botcazou @ 2020-06-23 16:33 UTC (permalink / raw)
To: gcc-patches
[-- Attachment #1: Type: text/plain, Size: 391 bytes --]
The problem is that Has_Constrained_Partial_View must be tested on the base
type of the designated type of an allocator.
Tested on x86-64/Linux, applied on all active branches.
2020-06-23 Eric Botcazou <ebotcazou@adacore.com>
* gcc-interface/trans.c (gnat_to_gnu) <N_Allocator>: Minor tweaks.
Call Has_Constrained_Partial_View on base type of the designated type.
--
Eric Botcazou
[-- Attachment #2: p.diff --]
[-- Type: text/x-patch, Size: 1480 bytes --]
diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c
index c32bdb96a5e..f74e0e728c9 100644
--- a/gcc/ada/gcc-interface/trans.c
+++ b/gcc/ada/gcc-interface/trans.c
@@ -7154,9 +7154,8 @@ gnat_to_gnu (Node_Id gnat_node)
case N_Allocator:
{
- tree gnu_init = NULL_TREE;
- tree gnu_type;
- bool ignore_init_type = false;
+ tree gnu_type, gnu_init;
+ bool ignore_init_type;
gnat_temp = Expression (gnat_node);
@@ -7165,15 +7164,22 @@ gnat_to_gnu (Node_Id gnat_node)
contains both the type and an initial value for the object. */
if (Nkind (gnat_temp) == N_Identifier
|| Nkind (gnat_temp) == N_Expanded_Name)
- gnu_type = gnat_to_gnu_type (Entity (gnat_temp));
+ {
+ ignore_init_type = false;
+ gnu_init = NULL_TREE;
+ gnu_type = gnat_to_gnu_type (Entity (gnat_temp));
+ }
+
else if (Nkind (gnat_temp) == N_Qualified_Expression)
{
const Entity_Id gnat_desig_type
= Designated_Type (Underlying_Type (Etype (gnat_node)));
- ignore_init_type = Has_Constrained_Partial_View (gnat_desig_type);
- gnu_init = gnat_to_gnu (Expression (gnat_temp));
+ /* The flag is effectively only set on the base types. */
+ ignore_init_type
+ = Has_Constrained_Partial_View (Base_Type (gnat_desig_type));
+ gnu_init = gnat_to_gnu (Expression (gnat_temp));
gnu_init = maybe_unconstrained_array (gnu_init);
gigi_checking_assert (!Do_Range_Check (Expression (gnat_temp)));
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-06-23 16:36 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-23 16:33 [Ada] Fix memory corruption with vector and variant record Eric Botcazou
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).