diff mbox series

[Ada] Fix PR ada/104258

Message ID 4373989.LvFx2qVVIh@fomalhaut
State New
Headers show
Series [Ada] Fix PR ada/104258 | expand

Commit Message

Eric Botcazou Jan. 28, 2022, 10:10 a.m. UTC 
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.
diff mbox series

Patch

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));