[Ada] Rewrite extended names in derived class-wide expressions

Message ID 20211011133925.GA1518884@adacore.com
State New
Headers show
Series
  • [Ada] Rewrite extended names in derived class-wide expressions
Related show

Commit Message

Jason Merrill via Gcc-patches Oct. 11, 2021, 1:39 p.m.
When building a derived class-wide pre- or postcondition we are mapping
references to inherited formals and subprogram.

Originally we only did it for simple names; recently we fixed this
mapping to also work for operator symbols; with this patch we also do
this for extended names.

Tested on x86_64-pc-linux-gnu, committed on trunk

gcc/ada/

	* exp_util.adb (Build_Class_Wide_Expression): Replace entities
	of both simple and extended names.

Patch

diff --git a/gcc/ada/exp_util.adb b/gcc/ada/exp_util.adb
--- a/gcc/ada/exp_util.adb
+++ b/gcc/ada/exp_util.adb
@@ -1293,7 +1293,7 @@  package body Exp_Util is
             Adjust_Inherited_Pragma_Sloc (N);
          end if;
 
-         if Nkind (N) in N_Identifier | N_Operator_Symbol
+         if Nkind (N) in N_Identifier | N_Expanded_Name | N_Operator_Symbol
            and then Present (Entity (N))
            and then
              (Is_Formal (Entity (N)) or else Is_Subprogram (Entity (N)))