From: "Marc Poulhiès" <poulhies@adacore.com>
To: gcc-patches@gcc.gnu.org
Cc: Viljar Indus <indus@adacore.com>
Subject: [COMMITTED] ada: Apply correct element type for container aggregates
Date: Tue, 18 Jul 2023 15:13:40 +0200 [thread overview]
Message-ID: <20230718131340.81451-1-poulhies@adacore.com> (raw)
From: Viljar Indus <indus@adacore.com>
When dealing with a container aggregate with an iterator
specification the iterator should take the value of the
element of the container instead of the key.
gcc/ada/
* sem_aggr.adb (Resolve_Iterated_Association): Use the element
type for the iterator in a container aggregate with an iterator
specification.
Tested on x86_64-pc-linux-gnu, committed on master.
---
gcc/ada/sem_aggr.adb | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/gcc/ada/sem_aggr.adb b/gcc/ada/sem_aggr.adb
index 5bfbde5052b..ecd508a66f8 100644
--- a/gcc/ada/sem_aggr.adb
+++ b/gcc/ada/sem_aggr.adb
@@ -3228,6 +3228,8 @@ package body Sem_Aggr is
Analyze_And_Resolve (New_Copy_Tree (Key_Expr), Key_Type);
End_Scope;
+ Typ := Key_Type;
+
elsif Present (Iterator_Specification (Comp)) then
Copy := Copy_Separate_Tree (Iterator_Specification (Comp));
Id_Name :=
@@ -3252,7 +3254,7 @@ package body Sem_Aggr is
elsif Present (Key_Type) then
Analyze_And_Resolve (Choice, Key_Type);
-
+ Typ := Key_Type;
else
Typ := Etype (Choice); -- assume unique for now
end if;
@@ -3282,12 +3284,8 @@ package body Sem_Aggr is
Enter_Name (Id);
- if No (Key_Type) then
- pragma Assert (Present (Typ));
- Set_Etype (Id, Typ);
- else
- Set_Etype (Id, Key_Type);
- end if;
+ pragma Assert (Present (Typ));
+ Set_Etype (Id, Typ);
Mutate_Ekind (Id, E_Variable);
Set_Is_Not_Self_Hidden (Id);
--
2.40.0
reply other threads:[~2023-07-18 13:13 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230718131340.81451-1-poulhies@adacore.com \
--to=poulhies@adacore.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=indus@adacore.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).