From: Eric Botcazou <botcazou@adacore.com>
To: gcc-patches@gcc.gnu.org
Subject: [Ada] Fix PR ada/104258
Date: Fri, 28 Jan 2022 11:10:54 +0100 [thread overview]
Message-ID: <4373989.LvFx2qVVIh@fomalhaut> (raw)
[-- Attachment #1: Type: text/plain, Size: 549 bytes --]
This is a regression present on mainline and 11 branch: the new transformation
applied during expansion by Narrow_Large_Operation would incorrectly perform
name resolution for the operator again.
Tested on x86_64-suse-linux, applied on mainline and 11 branch.
2022-01-28 Eric Botcazou <ebotcazou@adacore.com>
PR ada/104258
* exp_ch4.adb (Narrow_Large_Operation): Also copy the entity, if
any, when rewriting the operator node.
2022-01-28 Eric Botcazou <ebotcazou@adacore.com>
* gnat.dg/generic_comp.adb: New test.
--
Eric Botcazou
[-- Attachment #2: p.diff --]
[-- Type: text/x-patch, Size: 655 bytes --]
diff --git a/gcc/ada/exp_ch4.adb b/gcc/ada/exp_ch4.adb
index c31f5bb36ba..2506c67e936 100644
--- a/gcc/ada/exp_ch4.adb
+++ b/gcc/ada/exp_ch4.adb
@@ -14314,9 +14314,13 @@ package body Exp_Ch4 is
return;
end if;
- -- Finally, rewrite the operation in the narrower type
+ -- Finally, rewrite the operation in the narrower type, but make sure
+ -- not to perform name resolution for the operator again.
Nop := New_Op_Node (Kind, Sloc (N));
+ if Nkind (N) in N_Has_Entity then
+ Set_Entity (Nop, Entity (N));
+ end if;
if Binary then
Set_Left_Opnd (Nop, Convert_To (Ntyp, L));
[-- Attachment #3: generic_comp.adb --]
[-- Type: text/x-adasrc, Size: 1078 bytes --]
-- { dg-do run }
procedure Generic_Comp is
generic
type Element_Type is private;
type Index_Type is (<>);
type Array_Type is array (Index_Type range <>) of Element_Type;
with function ">" (Left, Right : Element_Type) return Boolean is <>;
procedure Gen (Data: in out Array_Type);
procedure Gen (Data: in out Array_Type) is
begin
if not (Data'Length > 1)
or else not (Integer'(Data'Length) > 1)
or else not Standard.">" (Data'Length, 1)
or else not Standard.">" (Integer'(Data'Length), 1)
then
raise Program_Error;
end if;
end;
type My_Array is array (Positive range <>) of Integer;
function Less_Than (L, R : Integer) return Boolean is
begin
return L < R;
end;
procedure Chk_Down is new Gen (Element_Type => Integer,
Index_Type => Positive,
Array_Type => My_Array,
">" => Less_Than);
Data : My_Array (1 .. 2);
begin
Chk_Down (Data);
end;
reply other threads:[~2022-01-28 10:10 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=4373989.LvFx2qVVIh@fomalhaut \
--to=botcazou@adacore.com \
--cc=gcc-patches@gcc.gnu.org \
/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).