diff mbox series

[COMMITED] ada: Delay expansion of iterator specification in preanalysis

Message ID 20220926091505.273202-1-poulhies@adacore.com
State Committed
Headers
Series [COMMITED] ada: Delay expansion of iterator specification in preanalysis |

Commit Message

Marc Poulhiès Sept. 26, 2022, 9:15 a.m. UTC 
  From: Piotr Trojanek <trojanek@adacore.com>

When preanalysing spec expression (e.g. expression of an expression
function), the name of iterator specification should not be expanded.

This patch simplifies a complicated condition for delaying expansion
within quantified expressions and iterated component associations.

gcc/ada/

	* sem_ch5.adb (Analyze_Iterator_Specification): Delay expansion
	based on Full_Analysis flag.
---
 gcc/ada/sem_ch5.adb | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
diff mbox series

Patch

diff --git a/gcc/ada/sem_ch5.adb b/gcc/ada/sem_ch5.adb
index 6d07f3d09e5..d0f00b31161 100644
--- a/gcc/ada/sem_ch5.adb
+++ b/gcc/ada/sem_ch5.adb
@@ -2429,14 +2429,9 @@  package body Sem_Ch5 is
 
       if not Is_Entity_Name (Iter_Name)
 
-        --  When the context is a quantified expression or iterated component
-        --  association, the renaming declaration is delayed until the
-        --  expansion phase if we are doing expansion.
-
-        and then (Nkind (Parent (N)) not in N_Quantified_Expression
-                                          | N_Iterated_Component_Association
-                   or else (Operating_Mode = Check_Semantics
-                            and then not GNATprove_Mode))
+        --  Do not perform this expansion in preanalysis
+
+        and then Full_Analysis
 
         --  Do not perform this expansion when expansion is disabled, where the
         --  temporary may hide the transformation of a selected component into