From 450b2267fea74fd5d01a8afaae020d5bdf372d6a Mon Sep 17 00:00:00 2001
From: Romain Beguet <beguet@adacore.com>
Date: Fri, 17 Nov 2023 17:03:35 +0100
Subject: [PATCH 1/2] Refactor `ForLoopSpec` equations.

In particular, remove all calls to resolve_internal_*, which are really hard
to reason about as they may trigger recursive calls to the solver.
---
 ada/ast.py | 124 ++++++++++++++++++++++-------------------------------
 1 file changed, 51 insertions(+), 73 deletions(-)

diff --git a/ada/ast.py b/ada/ast.py
index 48ce2c7c9..09ca316a8 100644
--- a/ada/ast.py
+++ b/ada/ast.py
@@ -6625,13 +6625,28 @@ def is_iterator_type():
             ['Ada', 'Iterator_Interfaces'], UnitSpecification
         ))
         typ = Var(Entity.cast(T.ClasswideTypeDecl).then(
-            lambda cw: cw.type_decl, default_val=Entity)
-        )
+            lambda cw: cw.type_decl, default_val=Entity
+        ))
         return Or(
             typ.semantic_parent.semantic_parent.node == iifcs,
             Entity.canonical_part.has_aspect("Iterable")
         )
 
+    @langkit_property(return_type=T.BaseTypeDecl.entity, dynamic_vars=[origin])
+    def cursor_type():
+        """
+        Assuming this is an iterator type, return the associated cursor
+        type.
+        """
+        return (
+            # For containers and user defined iterator types, cursor type
+            # is defined by the `Cursor` type declaration.
+            Entity.children_env.get_first('Cursor')
+            .cast_or_raise(T.BaseTypeDecl)
+            # Check out cursor type for types with `Iterable` aspect
+            ._or(Entity.cast(TypeDecl).iterable_cursor_type)
+        )
+
     @langkit_property(dynamic_vars=[default_origin()], public=True)
     def is_discrete_type():
         """
@@ -6980,6 +6995,18 @@ def is_limited_type():
     def iterable_comp_type():
         return No(T.BaseTypeDecl.entity)
 
+    @langkit_property(dynamic_vars=[origin])
+    def iterable_comp_type_or_null():
+        return If(
+            Self.is_null,
+            No(BaseTypeDecl.entity),
+            If(
+                Entity.is_implicit_deref,
+                Entity.accessed_type,
+                Entity
+            ).iterable_comp_type
+        )
+
     @langkit_property(return_type=Bool, dynamic_vars=[origin])
     def matching_prefix_type(container_type=T.BaseTypeDecl.entity):
         """
@@ -7734,7 +7761,8 @@ def iterable_cursor_type():
         return Entity.get_aspect_spec_expr('Iterable').then(
             lambda it: it.cast(T.Aggregate).assocs.unpacked_params.find(
                 lambda sa: sa.name.name_is('First')
-            ).assoc.expr.cast_or_raise(T.Name).referenced_decl.expr_type)
+            ).assoc.expr.cast_or_raise(T.Name).referenced_decl.expr_type
+        )
 
     @langkit_property()
     def discrete_range():
@@ -19412,37 +19440,6 @@ def is_iterated_assoc_spec():
         """
         return Self.parent.is_a(IteratedAssoc)
 
-    @langkit_property(memoized=True, call_memoizable=True,
-                      dynamic_vars=[env, origin])
-    def iter_type():
-        type_var = Var(Entity.iter_expr.cast_or_raise(Expr).type_var)
-
-        p = Var(Entity.iter_expr.resolve_names_internal_with_eq(
-            # Avoid resolving to a procedure
-            Predicate(AdaNode.is_not_null, type_var)
-
-            # If there is a type annotation, use it as the expected type for
-            # `iter_expr`.
-            & If(
-                Self.var_decl.id_type.is_null,
-                LogicTrue(),
-                Bind(Self.iter_expr.cast(Expr).expected_type_var,
-                     Entity.var_decl.id_type.designated_type)
-            )
-        ))
-
-        typ = Var(If(
-            p,
-            type_var.get_value.cast(T.BaseTypeDecl),
-            No(BaseTypeDecl.entity)
-        ))
-
-        return origin.bind(Self.origin_node, If(
-            typ.is_implicit_deref,
-            typ.accessed_type,
-            typ
-        ))
-
     @langkit_property(return_type=Equation)
     def xref_equation():
         return Entity.var_decl.sub_equation & Self.loop_type.match(
@@ -19475,26 +19472,34 @@ def xref_equation():
                 # attribute on a subtype indication, in which case the logic is
                 # the same as above, either it's an expression that yields an
                 # iterator.
-                lambda t=T.Name: t.name_designated_type.then(
+                lambda t=T.Name: t.sub_equation & t.name_designated_type.then(
                     lambda typ:
-                    t.sub_equation
-                    & Bind(Self.var_decl.id.type_var, typ.canonical_type),
-                    default_val=Entity.iterator_xref_equation
+                    Bind(Self.var_decl.id.type_var, typ.canonical_type),
+                    default_val=And(
+                        Predicate(BaseTypeDecl.is_iterator_type, t.type_var),
+                        Bind(t.type_var, Self.var_decl.id.type_var,
+                             conv_prop=BaseTypeDecl.cursor_type)
+                    )
                 ),
 
                 lambda _: LogicTrue()  # should never happen
             ),
 
             # This is a for .. of
-            lambda _=IterType.alt_of: Let(lambda it_typ=Entity.iter_type: If(
-                it_typ.is_iterable_type,
-
-                # Then we want the type of the induction variable to be the
-                # component type of the type of the expression.
-                Bind(Self.var_decl.id.type_var, it_typ.iterable_comp_type),
+            lambda _=IterType.alt_of: Entity.iter_expr.cast(Expr).then(
+                lambda iter_expr:
+                Entity.var_decl.id_type.then(
+                    lambda typ:
+                    Bind(iter_expr.expected_type_var, typ.designated_type),
+                    default_val=LogicTrue()
+                )
+                & iter_expr.sub_equation
+                & Predicate(AdaNode.is_not_null, iter_expr.type_var)
+                & Bind(iter_expr.type_var, Self.var_decl.id.type_var,
+                       conv_prop=BaseTypeDecl.iterable_comp_type_or_null),
+                default_val=LogicFalse()
+            )
 
-                LogicFalse()
-            ))
         ) & If(
             Entity.iter_filter.is_null,
             LogicTrue(),
@@ -19503,33 +19508,6 @@ def xref_equation():
             & Entity.iter_filter.sub_equation
         )
 
-    @langkit_property(return_type=Equation, dynamic_vars=[env, origin])
-    def iterator_xref_equation():
-        iter_expr = Var(Entity.iter_expr.cast_or_raise(T.Expr))
-
-        p = Var(iter_expr.resolve_names_internal_with_eq(
-            Predicate(BaseTypeDecl.is_iterator_type,
-                      iter_expr.type_var)
-        ))
-
-        cursor_type = Var(
-            Let(
-                lambda tv=iter_expr.type_val:
-                # For containers and user defined iterator types, cursor type
-                # is defined by the `Cursor` type declaration.
-                tv.children_env.get_first('Cursor')
-                .cast_or_raise(T.BaseTypeDecl)
-                # Check out cursor type for types with `Iterable` aspect
-                ._or(tv.cast(TypeDecl).iterable_cursor_type)
-            )
-        )
-
-        return If(
-            p,
-            Bind(Self.var_decl.id.type_var, cursor_type),
-            LogicFalse()
-        )
-
     # This spec is not a complete resolution context when part of an iterated
     # component association: we must know the type of the enclosing aggregate
     # to determine the type of the iteration variable in case of a `for I in`.

From 4a1d2ff3e324cc0b48c12d2923c3469e216ecbe1 Mon Sep 17 00:00:00 2001
From: Romain Beguet <beguet@adacore.com>
Date: Fri, 17 Nov 2023 09:35:11 +0100
Subject: [PATCH 2/2] Introduce dedicated ForLoopIterFilter node to fix their
 name resolution.

---
 ada/ast.py                                    |  47 +-
 ada/grammar.py                                |   2 +-
 .../container_aggregate/pkg.adb               |   4 +-
 .../container_aggregate/test.out              | 108 +++--
 .../tests/name_resolution/for_loop_6/test.adb |  17 +
 .../tests/name_resolution/for_loop_6/test.out |  52 +++
 .../name_resolution/for_loop_6/test.yaml      |   2 +
 .../iterassoc_filter.adb                      |  20 +-
 .../iterated_component_association/test.out   | 440 ++++++++++++------
 .../tests/name_resolution/reduce_attr/acc.adb |   2 +-
 .../name_resolution/reduce_attr/test.out      | 105 ++++-
 11 files changed, 558 insertions(+), 241 deletions(-)
 create mode 100644 testsuite/tests/name_resolution/for_loop_6/test.adb
 create mode 100644 testsuite/tests/name_resolution/for_loop_6/test.out
 create mode 100644 testsuite/tests/name_resolution/for_loop_6/test.yaml

diff --git a/ada/ast.py b/ada/ast.py
index 09ca316a8..7a637d562 100644
--- a/ada/ast.py
+++ b/ada/ast.py
@@ -12664,16 +12664,6 @@ def expected_type_var():
         """
     )
 
-    xref_stop_resolution = Property(
-        # Pause resolution of ForLoopSpecs' iterator filter expression, so
-        # that the indexing variable's type can be fully inferred first.
-        # Otherwise, any reference to the indexing variable appearing in the
-        # filter expression will cause an infinite xref_equation recursion.
-        Self.parent.cast(T.ForLoopSpec).then(
-            lambda spec: spec.iter_filter == Self
-        )
-    )
-
     @langkit_property(return_type=T.Bool)
     def has_context_free_type():
         """
@@ -19430,7 +19420,7 @@ class ForLoopSpec(LoopSpec):
     loop_type = Field(type=IterType)
     has_reverse = Field(type=Reverse)
     iter_expr = Field(type=T.AdaNode)
-    iter_filter = Field(type=T.Expr)
+    iter_filter = Field(type=T.ForLoopIterFilter)
 
     @langkit_property(return_type=Bool)
     def is_iterated_assoc_spec():
@@ -19499,13 +19489,6 @@ def xref_equation():
                        conv_prop=BaseTypeDecl.iterable_comp_type_or_null),
                 default_val=LogicFalse()
             )
-
-        ) & If(
-            Entity.iter_filter.is_null,
-            LogicTrue(),
-            Bind(Self.iter_filter.expected_type_var, Self.bool_type)
-            & Bind(Self.iter_filter.type_var, Self.bool_type)
-            & Entity.iter_filter.sub_equation
         )
 
     # This spec is not a complete resolution context when part of an iterated
@@ -19514,6 +19497,34 @@ def xref_equation():
     xref_entry_point = Property(Not(Self.is_iterated_assoc_spec))
 
 
+class ForLoopIterFilter(AdaNode):
+    """
+    Represent the ``when ...`` filter after a for loop specification. This
+    class has no RM existence, it is used internally to wrap the filtering
+    expression, so as to have a dedicated name resolution entry point for it
+    and make sure it is resolved separatly from the ``ForLoopSpec`` itself
+    (which it cannot influence anyway).
+    """
+    expr = Field(type=T.Expr)
+
+    @langkit_property(return_type=Equation)
+    def xref_equation():
+        ignore(Var(Entity.parent.cast(ForLoopSpec).then(
+            lambda spec: If(
+                spec.is_iterated_assoc_spec,
+                spec.resolve_names_from_closest_entry_point,
+                True
+            )
+        )))
+        return And(
+            Bind(Self.expr.expected_type_var, Self.bool_type),
+            Entity.expr.sub_equation,
+            Entity.expr.matches_expected_formal_prim_type
+        )
+
+    xref_entry_point = Property(True)
+
+
 class QuantifiedExpr(Expr):
     """
     Quantified expression (:rmlink:`4.5.8`).
diff --git a/ada/grammar.py b/ada/grammar.py
index 33f443a97..c84871835 100644
--- a/ada/grammar.py
+++ b/ada/grammar.py
@@ -1140,7 +1140,7 @@ def end_named_block():
         IterType.alt_in("in") | IterType.alt_of("of"),
         Reverse("reverse"),
         A.discrete_range | A.discrete_subtype_indication | A.name,
-        Opt("when", A.expr)
+        Opt(ForLoopIterFilter("when", A.expr))
     ),
 
     quantified_expr=QuantifiedExpr(
diff --git a/testsuite/tests/name_resolution/container_aggregate/pkg.adb b/testsuite/tests/name_resolution/container_aggregate/pkg.adb
index 21e1d3688..aae3128c5 100644
--- a/testsuite/tests/name_resolution/container_aggregate/pkg.adb
+++ b/testsuite/tests/name_resolution/container_aggregate/pkg.adb
@@ -9,12 +9,10 @@ package body Pkg is
 
    procedure P (Arr : Arr_T) is
       Set1 : Set := [for E of Arr when E < 0 => E];
-      pragma Test_Statement;
       Set2 : Set := [for E of Arr when E < 0 or else E > 0 => E];
-      pragma Test_Statement;
       Set3 : Set := [for Item in 1 .. 5 => Item * 2];
-      pragma Test_Statement;
    begin
       null;
    end P;
+   pragma Test_Block;
 end Pkg;
diff --git a/testsuite/tests/name_resolution/container_aggregate/test.out b/testsuite/tests/name_resolution/container_aggregate/test.out
index 6017dd905..bad179621 100644
--- a/testsuite/tests/name_resolution/container_aggregate/test.out
+++ b/testsuite/tests/name_resolution/container_aggregate/test.out
@@ -233,6 +233,18 @@ Expr: <Str ""info@domain.com"" test3.adb:70:21-70:38>
 Analyzing pkg.adb
 #################
 
+Resolving xrefs for node <SubpSpec pkg.adb:10:4-10:29>
+******************************************************
+
+
+Resolving xrefs for node <ParamSpec ["Arr"] pkg.adb:10:17-10:28>
+****************************************************************
+
+Expr: <Id "Arr_T" pkg.adb:10:23-10:28>
+  references:    <DefiningName "Arr_T" pkg.ads:2:9-2:14>
+  type:          None
+  expected type: None
+
 Resolving xrefs for node <ObjectDecl ["Set1"] pkg.adb:11:7-11:52>
 *****************************************************************
 
@@ -247,6 +259,14 @@ Expr: <Id "Arr" pkg.adb:11:31-11:34>
   references:    <DefiningName "Arr" pkg.adb:10:17-10:20>
   type:          <ConcreteTypeDecl ["Arr_T"] pkg.ads:2:4-2:55>
   expected type: None
+Expr: <Id "E" pkg.adb:11:49-11:50>
+  references:    <DefiningName "E" pkg.adb:11:26-11:27>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+
+Resolving xrefs for node <ForLoopIterFilter pkg.adb:11:35-11:45>
+****************************************************************
+
 Expr: <RelationOp pkg.adb:11:40-11:45>
   type:          <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
   expected type: <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
@@ -262,108 +282,124 @@ Expr: <Int pkg.adb:11:44-11:45>
   references:    None
   type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
   expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
-Expr: <Id "E" pkg.adb:11:49-11:50>
-  references:    <DefiningName "E" pkg.adb:11:26-11:27>
-  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
-  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
 
-Resolving xrefs for node <ObjectDecl ["Set2"] pkg.adb:13:7-13:66>
+Resolving xrefs for node <ObjectDecl ["Set2"] pkg.adb:12:7-12:66>
 *****************************************************************
 
-Expr: <Id "Set" pkg.adb:13:14-13:17>
+Expr: <Id "Set" pkg.adb:12:14-12:17>
   references:    <DefiningName "Set" pkg.adb:8:12-8:15>
   type:          None
   expected type: None
-Expr: <BracketAggregate pkg.adb:13:21-13:65>
+Expr: <BracketAggregate pkg.adb:12:21-12:65>
   type:          <SubtypeDecl ["Set"] pkg.adb:8:4-8:32>
   expected type: <SubtypeDecl ["Set"] pkg.adb:8:4-8:32>
-Expr: <Id "Arr" pkg.adb:13:31-13:34>
+Expr: <Id "Arr" pkg.adb:12:31-12:34>
   references:    <DefiningName "Arr" pkg.adb:10:17-10:20>
   type:          <ConcreteTypeDecl ["Arr_T"] pkg.ads:2:4-2:55>
   expected type: None
-Expr: <BinOp pkg.adb:13:40-13:59>
+Expr: <Id "E" pkg.adb:12:63-12:64>
+  references:    <DefiningName "E" pkg.adb:12:26-12:27>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+
+Resolving xrefs for node <ForLoopIterFilter pkg.adb:12:35-12:59>
+****************************************************************
+
+Expr: <BinOp pkg.adb:12:40-12:59>
   type:          <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
   expected type: <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
-Expr: <RelationOp pkg.adb:13:40-13:45>
+Expr: <RelationOp pkg.adb:12:40-12:45>
   type:          <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
   expected type: <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
-Expr: <Id "E" pkg.adb:13:40-13:41>
-  references:    <DefiningName "E" pkg.adb:13:26-13:27>
+Expr: <Id "E" pkg.adb:12:40-12:41>
+  references:    <DefiningName "E" pkg.adb:12:26-12:27>
   type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
   expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
-Expr: <OpLt "<" pkg.adb:13:42-13:43>
+Expr: <OpLt "<" pkg.adb:12:42-12:43>
   references:    None
   type:          None
   expected type: None
-Expr: <Int pkg.adb:13:44-13:45>
+Expr: <Int pkg.adb:12:44-12:45>
   references:    None
   type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
   expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
-Expr: <OpOrElse "or else" pkg.adb:13:46-13:53>
+Expr: <OpOrElse "or else" pkg.adb:12:46-12:53>
   references:    None
   type:          None
   expected type: None
-Expr: <RelationOp pkg.adb:13:54-13:59>
+Expr: <RelationOp pkg.adb:12:54-12:59>
   type:          <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
   expected type: <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
-Expr: <Id "E" pkg.adb:13:54-13:55>
-  references:    <DefiningName "E" pkg.adb:13:26-13:27>
+Expr: <Id "E" pkg.adb:12:54-12:55>
+  references:    <DefiningName "E" pkg.adb:12:26-12:27>
   type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
   expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
-Expr: <OpGt ">" pkg.adb:13:56-13:57>
+Expr: <OpGt ">" pkg.adb:12:56-12:57>
   references:    None
   type:          None
   expected type: None
-Expr: <Int pkg.adb:13:58-13:59>
+Expr: <Int pkg.adb:12:58-12:59>
   references:    None
   type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
   expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
-Expr: <Id "E" pkg.adb:13:63-13:64>
-  references:    <DefiningName "E" pkg.adb:13:26-13:27>
-  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
-  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
 
-Resolving xrefs for node <ObjectDecl ["Set3"] pkg.adb:15:7-15:54>
+Resolving xrefs for node <ObjectDecl ["Set3"] pkg.adb:13:7-13:54>
 *****************************************************************
 
-Expr: <Id "Set" pkg.adb:15:14-15:17>
+Expr: <Id "Set" pkg.adb:13:14-13:17>
   references:    <DefiningName "Set" pkg.adb:8:12-8:15>
   type:          None
   expected type: None
-Expr: <BracketAggregate pkg.adb:15:21-15:53>
+Expr: <BracketAggregate pkg.adb:13:21-13:53>
   type:          <SubtypeDecl ["Set"] pkg.adb:8:4-8:32>
   expected type: <SubtypeDecl ["Set"] pkg.adb:8:4-8:32>
-Expr: <BinOp pkg.adb:15:34-15:40>
+Expr: <BinOp pkg.adb:13:34-13:40>
   type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
   expected type: <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
-Expr: <Int pkg.adb:15:34-15:35>
+Expr: <Int pkg.adb:13:34-13:35>
   references:    None
   type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
   expected type: <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
-Expr: <OpDoubleDot ".." pkg.adb:15:36-15:38>
+Expr: <OpDoubleDot ".." pkg.adb:13:36-13:38>
   references:    None
   type:          None
   expected type: None
-Expr: <Int pkg.adb:15:39-15:40>
+Expr: <Int pkg.adb:13:39-13:40>
   references:    None
   type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
   expected type: <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
-Expr: <BinOp pkg.adb:15:44-15:52>
+Expr: <BinOp pkg.adb:13:44-13:52>
   type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
   expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
-Expr: <Id "Item" pkg.adb:15:44-15:48>
-  references:    <DefiningName "Item" pkg.adb:15:26-15:30>
+Expr: <Id "Item" pkg.adb:13:44-13:48>
+  references:    <DefiningName "Item" pkg.adb:13:26-13:30>
   type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
   expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
-Expr: <OpMult "*" pkg.adb:15:49-15:50>
+Expr: <OpMult "*" pkg.adb:13:49-13:50>
   references:    None
   type:          None
   expected type: None
-Expr: <Int pkg.adb:15:51-15:52>
+Expr: <Int pkg.adb:13:51-13:52>
   references:    None
   type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
   expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
 
+Resolving xrefs for node <NullStmt pkg.adb:15:7-15:12>
+******************************************************
+
+
+Resolving xrefs for node <EndName pkg.adb:16:8-16:9>
+****************************************************
+
+Expr: <EndName pkg.adb:16:8-16:9>
+  references:    <DefiningName "P" pkg.adb:10:14-10:15>
+  type:          None
+  expected type: None
+Expr: <Id "P" pkg.adb:16:8-16:9>
+  references:    <DefiningName "P" pkg.adb:10:14-10:15>
+  type:          None
+  expected type: None
+
 
 Analyzing ai12_0212.adb
 #######################
diff --git a/testsuite/tests/name_resolution/for_loop_6/test.adb b/testsuite/tests/name_resolution/for_loop_6/test.adb
new file mode 100644
index 000000000..f13a94649
--- /dev/null
+++ b/testsuite/tests/name_resolution/for_loop_6/test.adb
@@ -0,0 +1,17 @@
+with Ada.Containers.Hashed_Maps;
+
+procedure Test is
+   function Hash (K : Integer) return Ada.Containers.Hash_Type is (0);
+
+   package My_Maps is new Ada.Containers.Hashed_Maps
+     (Integer, Integer, Hash, "=", "=");
+
+   use My_Maps;
+
+   V : Map;
+begin
+   for It in V.Iterate when Key (It) > 2 loop
+      null;
+   end loop;
+   pragma Test_Block;
+end Test;
diff --git a/testsuite/tests/name_resolution/for_loop_6/test.out b/testsuite/tests/name_resolution/for_loop_6/test.out
new file mode 100644
index 000000000..8250b683a
--- /dev/null
+++ b/testsuite/tests/name_resolution/for_loop_6/test.out
@@ -0,0 +1,52 @@
+Analyzing test.adb
+##################
+
+Resolving xrefs for node <ForLoopSpec test.adb:13:8-13:41>
+**********************************************************
+
+Expr: <DottedName test.adb:13:14-13:23>
+  references:    <| DefiningName "Iterate" a-cohama.ads:407:13-407:20 [test.adb:6:4] |>
+  type:          <| ClasswideTypeDecl ["Forward_Iterator"] a-iteint.ads:24:4-24:66 [test.adb:6:4, a-cohama.ads:135:4] |>
+  expected type: None
+Expr: <Id "V" test.adb:13:14-13:15>
+  references:    <DefiningName "V" test.adb:11:4-11:5>
+  type:          <| ConcreteTypeDecl ["Map"] a-cohama.ads:99:4-106:50 [test.adb:6:4] |>
+  expected type: <| ConcreteTypeDecl ["Map"] a-cohama.ads:99:4-106:50 [test.adb:6:4] |>
+Expr: <Id "Iterate" test.adb:13:16-13:23>
+  references:    <| DefiningName "Iterate" a-cohama.ads:407:13-407:20 [test.adb:6:4] |>
+  type:          <| ClasswideTypeDecl ["Forward_Iterator"] a-iteint.ads:24:4-24:66 [test.adb:6:4, a-cohama.ads:135:4] |>
+  expected type: None
+
+Resolving xrefs for node <ForLoopIterFilter test.adb:13:24-13:41>
+*****************************************************************
+
+Expr: <RelationOp test.adb:13:29-13:41>
+  type:          <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
+  expected type: <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
+Expr: <CallExpr test.adb:13:29-13:37>
+  references:    <| DefiningName "Key" a-cohama.ads:177:13-177:16 [test.adb:6:4] |>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <Id "Key" test.adb:13:29-13:32>
+  references:    <| DefiningName "Key" a-cohama.ads:177:13-177:16 [test.adb:6:4] |>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <Id "It" test.adb:13:34-13:36>
+  references:    <DefiningName "It" test.adb:13:8-13:10>
+  type:          <| ConcreteTypeDecl ["Cursor"] a-cohama.ads:110:4-110:27 [test.adb:6:4] |>
+  expected type: <| ConcreteTypeDecl ["Cursor"] a-cohama.ads:110:4-110:27 [test.adb:6:4] |>
+Expr: <OpGt ">" test.adb:13:38-13:39>
+  references:    None
+  type:          None
+  expected type: None
+Expr: <Int test.adb:13:40-13:41>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+
+Resolving xrefs for node <NullStmt test.adb:14:7-14:12>
+*******************************************************
+
+
+
+Done.
diff --git a/testsuite/tests/name_resolution/for_loop_6/test.yaml b/testsuite/tests/name_resolution/for_loop_6/test.yaml
new file mode 100644
index 000000000..173e325ff
--- /dev/null
+++ b/testsuite/tests/name_resolution/for_loop_6/test.yaml
@@ -0,0 +1,2 @@
+driver: name-resolution
+input_sources: [test.adb]
diff --git a/testsuite/tests/name_resolution/iterated_component_association/iterassoc_filter.adb b/testsuite/tests/name_resolution/iterated_component_association/iterassoc_filter.adb
index 13370be15..51f847a5e 100644
--- a/testsuite/tests/name_resolution/iterated_component_association/iterassoc_filter.adb
+++ b/testsuite/tests/name_resolution/iterated_component_association/iterassoc_filter.adb
@@ -5,13 +5,10 @@ procedure Iterassoc_Filter is
    X : A := (1.0, 2.0, 3.0, 4.0, 5.0);
 
    M : A := (for I in R when X (I) >= 3.0 => X (I) * X (I));
-   pragma Test_Statement;
 
    O : A := (for F : Float of X when F >= 3.0 => F * F);
-   pragma Test_Statement;
 
    P : A := (for F of X when F >= 3.0 => F * F);
-   pragma Test_Statement;
 
 
    type AA is array (R, R) of Float;
@@ -19,14 +16,13 @@ procedure Iterassoc_Filter is
    Q : AA :=
      (for I in R when X (I) >= 3.0 =>
        (for J in R when X (J) >= 3.0 => X (I) * X (J)));
-   pragma Test_Statement;
+
+   R : Boolean := (for all F of X when F >= 3.0 => F > 4.0);
+
+   S : Boolean := (for some I in 1 .. 5 when X (I) >= 3.0 => X (I) > 4.0);
 begin
-   declare
-      B : Boolean := (for all F of X when F >= 3.0 => F > 4.0);
-      C : Boolean := (for some I in 1 .. 5 when X (I) >= 3.0 => X (I) > 4.0);
-   begin
-      null;
-   end;
-   pragma Test_Block;
-   --  We use Test_Block so that inner ForLoopSpec nodes are also resolved
+   null;
 end Iterassoc_Filter;
+pragma Test_Block;
+--  We use Test_Block so that inner ForLoopSpec and ForLoopIterFilter nodes
+--  are also resolved.
diff --git a/testsuite/tests/name_resolution/iterated_component_association/test.out b/testsuite/tests/name_resolution/iterated_component_association/test.out
index fdb449749..a17bd3d99 100644
--- a/testsuite/tests/name_resolution/iterated_component_association/test.out
+++ b/testsuite/tests/name_resolution/iterated_component_association/test.out
@@ -308,6 +308,76 @@ Expr: <Id "J" iterassoc.adb:27:39-27:40>
 Analyzing iterassoc_filter.adb
 ##############################
 
+Resolving xrefs for node <SubpSpec iterassoc_filter.adb:1:1-1:27>
+*****************************************************************
+
+
+Resolving xrefs for node <ConcreteTypeDecl ["R"] iterassoc_filter.adb:2:4-2:27>
+*******************************************************************************
+
+Expr: <BinOp iterassoc_filter.adb:2:20-2:26>
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+Expr: <Int iterassoc_filter.adb:2:20-2:21>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+Expr: <OpDoubleDot ".." iterassoc_filter.adb:2:22-2:24>
+  references:    None
+  type:          None
+  expected type: None
+Expr: <Int iterassoc_filter.adb:2:25-2:26>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+
+Resolving xrefs for node <ConcreteTypeDecl ["A"] iterassoc_filter.adb:3:4-3:33>
+*******************************************************************************
+
+
+Resolving xrefs for node <ArrayTypeDef iterassoc_filter.adb:3:14-3:32>
+**********************************************************************
+
+Expr: <Id "R" iterassoc_filter.adb:3:21-3:22>
+  references:    <DefiningName "R" iterassoc_filter.adb:2:9-2:10>
+  type:          None
+  expected type: None
+Expr: <Id "Float" iterassoc_filter.adb:3:27-3:32>
+  references:    <DefiningName "Float" __standard:14:8-14:13>
+  type:          None
+  expected type: None
+
+Resolving xrefs for node <ObjectDecl ["X"] iterassoc_filter.adb:5:4-5:39>
+*************************************************************************
+
+Expr: <Id "A" iterassoc_filter.adb:5:8-5:9>
+  references:    <DefiningName "A" iterassoc_filter.adb:3:9-3:10>
+  type:          None
+  expected type: None
+Expr: <Aggregate iterassoc_filter.adb:5:13-5:38>
+  type:          <ConcreteTypeDecl ["A"] iterassoc_filter.adb:3:4-3:33>
+  expected type: <ConcreteTypeDecl ["A"] iterassoc_filter.adb:3:4-3:33>
+Expr: <Real iterassoc_filter.adb:5:14-5:17>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Real_Type_"] __standard:117:3-117:42>
+  expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
+Expr: <Real iterassoc_filter.adb:5:19-5:22>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Real_Type_"] __standard:117:3-117:42>
+  expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
+Expr: <Real iterassoc_filter.adb:5:24-5:27>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Real_Type_"] __standard:117:3-117:42>
+  expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
+Expr: <Real iterassoc_filter.adb:5:29-5:32>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Real_Type_"] __standard:117:3-117:42>
+  expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
+Expr: <Real iterassoc_filter.adb:5:34-5:37>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Real_Type_"] __standard:117:3-117:42>
+  expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
+
 Resolving xrefs for node <ObjectDecl ["M"] iterassoc_filter.adb:7:4-7:61>
 *************************************************************************
 
@@ -322,29 +392,6 @@ Expr: <Id "R" iterassoc_filter.adb:7:23-7:24>
   references:    <DefiningName "R" iterassoc_filter.adb:2:9-2:10>
   type:          <ConcreteTypeDecl ["R"] iterassoc_filter.adb:2:4-2:27>
   expected type: <ConcreteTypeDecl ["R"] iterassoc_filter.adb:2:4-2:27>
-Expr: <RelationOp iterassoc_filter.adb:7:30-7:42>
-  type:          <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
-  expected type: <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
-Expr: <CallExpr iterassoc_filter.adb:7:30-7:35>
-  references:    <DefiningName "X" iterassoc_filter.adb:5:4-5:5>
-  type:          <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
-  expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
-Expr: <Id "X" iterassoc_filter.adb:7:30-7:31>
-  references:    <DefiningName "X" iterassoc_filter.adb:5:4-5:5>
-  type:          <ConcreteTypeDecl ["A"] iterassoc_filter.adb:3:4-3:33>
-  expected type: None
-Expr: <Id "I" iterassoc_filter.adb:7:33-7:34>
-  references:    <DefiningName "I" iterassoc_filter.adb:7:18-7:19>
-  type:          <ConcreteTypeDecl ["R"] iterassoc_filter.adb:2:4-2:27>
-  expected type: <ConcreteTypeDecl ["R"] iterassoc_filter.adb:2:4-2:27>
-Expr: <OpGte ">=" iterassoc_filter.adb:7:36-7:38>
-  references:    None
-  type:          None
-  expected type: None
-Expr: <Real iterassoc_filter.adb:7:39-7:42>
-  references:    None
-  type:          <ConcreteTypeDecl ["Universal_Real_Type_"] __standard:117:3-117:42>
-  expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
 Expr: <BinOp iterassoc_filter.adb:7:46-7:59>
   type:          <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
   expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
@@ -377,333 +424,416 @@ Expr: <Id "I" iterassoc_filter.adb:7:57-7:58>
   type:          <ConcreteTypeDecl ["R"] iterassoc_filter.adb:2:4-2:27>
   expected type: <ConcreteTypeDecl ["R"] iterassoc_filter.adb:2:4-2:27>
 
-Resolving xrefs for node <ObjectDecl ["O"] iterassoc_filter.adb:10:4-10:57>
+Resolving xrefs for node <ForLoopIterFilter iterassoc_filter.adb:7:25-7:42>
 ***************************************************************************
 
-Expr: <Id "A" iterassoc_filter.adb:10:8-10:9>
+Expr: <RelationOp iterassoc_filter.adb:7:30-7:42>
+  type:          <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
+  expected type: <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
+Expr: <CallExpr iterassoc_filter.adb:7:30-7:35>
+  references:    <DefiningName "X" iterassoc_filter.adb:5:4-5:5>
+  type:          <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
+  expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
+Expr: <Id "X" iterassoc_filter.adb:7:30-7:31>
+  references:    <DefiningName "X" iterassoc_filter.adb:5:4-5:5>
+  type:          <ConcreteTypeDecl ["A"] iterassoc_filter.adb:3:4-3:33>
+  expected type: None
+Expr: <Id "I" iterassoc_filter.adb:7:33-7:34>
+  references:    <DefiningName "I" iterassoc_filter.adb:7:18-7:19>
+  type:          <ConcreteTypeDecl ["R"] iterassoc_filter.adb:2:4-2:27>
+  expected type: <ConcreteTypeDecl ["R"] iterassoc_filter.adb:2:4-2:27>
+Expr: <OpGte ">=" iterassoc_filter.adb:7:36-7:38>
+  references:    None
+  type:          None
+  expected type: None
+Expr: <Real iterassoc_filter.adb:7:39-7:42>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Real_Type_"] __standard:117:3-117:42>
+  expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
+
+Resolving xrefs for node <ObjectDecl ["O"] iterassoc_filter.adb:9:4-9:57>
+*************************************************************************
+
+Expr: <Id "A" iterassoc_filter.adb:9:8-9:9>
   references:    <DefiningName "A" iterassoc_filter.adb:3:9-3:10>
   type:          None
   expected type: None
-Expr: <Aggregate iterassoc_filter.adb:10:13-10:56>
+Expr: <Aggregate iterassoc_filter.adb:9:13-9:56>
   type:          <ConcreteTypeDecl ["A"] iterassoc_filter.adb:3:4-3:33>
   expected type: <ConcreteTypeDecl ["A"] iterassoc_filter.adb:3:4-3:33>
-Expr: <Id "Float" iterassoc_filter.adb:10:22-10:27>
+Expr: <Id "Float" iterassoc_filter.adb:9:22-9:27>
   references:    <DefiningName "Float" __standard:14:8-14:13>
   type:          None
   expected type: None
-Expr: <Id "X" iterassoc_filter.adb:10:31-10:32>
+Expr: <Id "X" iterassoc_filter.adb:9:31-9:32>
   references:    <DefiningName "X" iterassoc_filter.adb:5:4-5:5>
   type:          <ConcreteTypeDecl ["A"] iterassoc_filter.adb:3:4-3:33>
   expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
-Expr: <RelationOp iterassoc_filter.adb:10:38-10:46>
-  type:          <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
-  expected type: <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
-Expr: <Id "F" iterassoc_filter.adb:10:38-10:39>
-  references:    <DefiningName "F" iterassoc_filter.adb:10:18-10:19>
+Expr: <BinOp iterassoc_filter.adb:9:50-9:55>
+  type:          <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
+  expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
+Expr: <Id "F" iterassoc_filter.adb:9:50-9:51>
+  references:    <DefiningName "F" iterassoc_filter.adb:9:18-9:19>
   type:          <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
   expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
-Expr: <OpGte ">=" iterassoc_filter.adb:10:40-10:42>
+Expr: <OpMult "*" iterassoc_filter.adb:9:52-9:53>
   references:    None
   type:          None
   expected type: None
-Expr: <Real iterassoc_filter.adb:10:43-10:46>
-  references:    None
-  type:          <ConcreteTypeDecl ["Universal_Real_Type_"] __standard:117:3-117:42>
-  expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
-Expr: <BinOp iterassoc_filter.adb:10:50-10:55>
+Expr: <Id "F" iterassoc_filter.adb:9:54-9:55>
+  references:    <DefiningName "F" iterassoc_filter.adb:9:18-9:19>
   type:          <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
   expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
-Expr: <Id "F" iterassoc_filter.adb:10:50-10:51>
-  references:    <DefiningName "F" iterassoc_filter.adb:10:18-10:19>
+
+Resolving xrefs for node <ForLoopIterFilter iterassoc_filter.adb:9:33-9:46>
+***************************************************************************
+
+Expr: <RelationOp iterassoc_filter.adb:9:38-9:46>
+  type:          <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
+  expected type: <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
+Expr: <Id "F" iterassoc_filter.adb:9:38-9:39>
+  references:    <DefiningName "F" iterassoc_filter.adb:9:18-9:19>
   type:          <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
   expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
-Expr: <OpMult "*" iterassoc_filter.adb:10:52-10:53>
+Expr: <OpGte ">=" iterassoc_filter.adb:9:40-9:42>
   references:    None
   type:          None
   expected type: None
-Expr: <Id "F" iterassoc_filter.adb:10:54-10:55>
-  references:    <DefiningName "F" iterassoc_filter.adb:10:18-10:19>
-  type:          <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
+Expr: <Real iterassoc_filter.adb:9:43-9:46>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Real_Type_"] __standard:117:3-117:42>
   expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
 
-Resolving xrefs for node <ObjectDecl ["P"] iterassoc_filter.adb:13:4-13:49>
+Resolving xrefs for node <ObjectDecl ["P"] iterassoc_filter.adb:11:4-11:49>
 ***************************************************************************
 
-Expr: <Id "A" iterassoc_filter.adb:13:8-13:9>
+Expr: <Id "A" iterassoc_filter.adb:11:8-11:9>
   references:    <DefiningName "A" iterassoc_filter.adb:3:9-3:10>
   type:          None
   expected type: None
-Expr: <Aggregate iterassoc_filter.adb:13:13-13:48>
+Expr: <Aggregate iterassoc_filter.adb:11:13-11:48>
   type:          <ConcreteTypeDecl ["A"] iterassoc_filter.adb:3:4-3:33>
   expected type: <ConcreteTypeDecl ["A"] iterassoc_filter.adb:3:4-3:33>
-Expr: <Id "X" iterassoc_filter.adb:13:23-13:24>
+Expr: <Id "X" iterassoc_filter.adb:11:23-11:24>
   references:    <DefiningName "X" iterassoc_filter.adb:5:4-5:5>
   type:          <ConcreteTypeDecl ["A"] iterassoc_filter.adb:3:4-3:33>
   expected type: None
-Expr: <RelationOp iterassoc_filter.adb:13:30-13:38>
-  type:          <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
-  expected type: <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
-Expr: <Id "F" iterassoc_filter.adb:13:30-13:31>
-  references:    <DefiningName "F" iterassoc_filter.adb:13:18-13:19>
+Expr: <BinOp iterassoc_filter.adb:11:42-11:47>
   type:          <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
   expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
-Expr: <OpGte ">=" iterassoc_filter.adb:13:32-13:34>
+Expr: <Id "F" iterassoc_filter.adb:11:42-11:43>
+  references:    <DefiningName "F" iterassoc_filter.adb:11:18-11:19>
+  type:          <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
+  expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
+Expr: <OpMult "*" iterassoc_filter.adb:11:44-11:45>
   references:    None
   type:          None
   expected type: None
-Expr: <Real iterassoc_filter.adb:13:35-13:38>
-  references:    None
-  type:          <ConcreteTypeDecl ["Universal_Real_Type_"] __standard:117:3-117:42>
-  expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
-Expr: <BinOp iterassoc_filter.adb:13:42-13:47>
+Expr: <Id "F" iterassoc_filter.adb:11:46-11:47>
+  references:    <DefiningName "F" iterassoc_filter.adb:11:18-11:19>
   type:          <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
   expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
-Expr: <Id "F" iterassoc_filter.adb:13:42-13:43>
-  references:    <DefiningName "F" iterassoc_filter.adb:13:18-13:19>
+
+Resolving xrefs for node <ForLoopIterFilter iterassoc_filter.adb:11:25-11:38>
+*****************************************************************************
+
+Expr: <RelationOp iterassoc_filter.adb:11:30-11:38>
+  type:          <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
+  expected type: <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
+Expr: <Id "F" iterassoc_filter.adb:11:30-11:31>
+  references:    <DefiningName "F" iterassoc_filter.adb:11:18-11:19>
   type:          <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
   expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
-Expr: <OpMult "*" iterassoc_filter.adb:13:44-13:45>
+Expr: <OpGte ">=" iterassoc_filter.adb:11:32-11:34>
   references:    None
   type:          None
   expected type: None
-Expr: <Id "F" iterassoc_filter.adb:13:46-13:47>
-  references:    <DefiningName "F" iterassoc_filter.adb:13:18-13:19>
-  type:          <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
+Expr: <Real iterassoc_filter.adb:11:35-11:38>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Real_Type_"] __standard:117:3-117:42>
   expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
 
-Resolving xrefs for node <ObjectDecl ["Q"] iterassoc_filter.adb:19:4-21:57>
+Resolving xrefs for node <ConcreteTypeDecl ["AA"] iterassoc_filter.adb:14:4-14:37>
+**********************************************************************************
+
+
+Resolving xrefs for node <ArrayTypeDef iterassoc_filter.adb:14:15-14:36>
+************************************************************************
+
+Expr: <Id "R" iterassoc_filter.adb:14:22-14:23>
+  references:    <DefiningName "R" iterassoc_filter.adb:2:9-2:10>
+  type:          None
+  expected type: None
+Expr: <Id "R" iterassoc_filter.adb:14:25-14:26>
+  references:    <DefiningName "R" iterassoc_filter.adb:2:9-2:10>
+  type:          None
+  expected type: None
+Expr: <Id "Float" iterassoc_filter.adb:14:31-14:36>
+  references:    <DefiningName "Float" __standard:14:8-14:13>
+  type:          None
+  expected type: None
+
+Resolving xrefs for node <ObjectDecl ["Q"] iterassoc_filter.adb:16:4-18:57>
 ***************************************************************************
 
-Expr: <Id "AA" iterassoc_filter.adb:19:8-19:10>
-  references:    <DefiningName "AA" iterassoc_filter.adb:17:9-17:11>
+Expr: <Id "AA" iterassoc_filter.adb:16:8-16:10>
+  references:    <DefiningName "AA" iterassoc_filter.adb:14:9-14:11>
   type:          None
   expected type: None
-Expr: <Aggregate iterassoc_filter.adb:20:6-21:56>
-  type:          <ConcreteTypeDecl ["AA"] iterassoc_filter.adb:17:4-17:37>
-  expected type: <ConcreteTypeDecl ["AA"] iterassoc_filter.adb:17:4-17:37>
-Expr: <Id "R" iterassoc_filter.adb:20:16-20:17>
+Expr: <Aggregate iterassoc_filter.adb:17:6-18:56>
+  type:          <ConcreteTypeDecl ["AA"] iterassoc_filter.adb:14:4-14:37>
+  expected type: <ConcreteTypeDecl ["AA"] iterassoc_filter.adb:14:4-14:37>
+Expr: <Id "R" iterassoc_filter.adb:17:16-17:17>
   references:    <DefiningName "R" iterassoc_filter.adb:2:9-2:10>
   type:          <ConcreteTypeDecl ["R"] iterassoc_filter.adb:2:4-2:27>
   expected type: <ConcreteTypeDecl ["R"] iterassoc_filter.adb:2:4-2:27>
-Expr: <RelationOp iterassoc_filter.adb:20:23-20:35>
-  type:          <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
-  expected type: <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
-Expr: <CallExpr iterassoc_filter.adb:20:23-20:28>
+Expr: <Aggregate iterassoc_filter.adb:18:8-18:55>
+  type:          None
+  expected type: None
+Expr: <Id "R" iterassoc_filter.adb:18:18-18:19>
+  references:    <DefiningName "R" iterassoc_filter.adb:2:9-2:10>
+  type:          <ConcreteTypeDecl ["R"] iterassoc_filter.adb:2:4-2:27>
+  expected type: <ConcreteTypeDecl ["R"] iterassoc_filter.adb:2:4-2:27>
+Expr: <BinOp iterassoc_filter.adb:18:41-18:54>
+  type:          <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
+  expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
+Expr: <CallExpr iterassoc_filter.adb:18:41-18:46>
   references:    <DefiningName "X" iterassoc_filter.adb:5:4-5:5>
   type:          <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
   expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
-Expr: <Id "X" iterassoc_filter.adb:20:23-20:24>
+Expr: <Id "X" iterassoc_filter.adb:18:41-18:42>
   references:    <DefiningName "X" iterassoc_filter.adb:5:4-5:5>
   type:          <ConcreteTypeDecl ["A"] iterassoc_filter.adb:3:4-3:33>
   expected type: None
-Expr: <Id "I" iterassoc_filter.adb:20:26-20:27>
-  references:    <DefiningName "I" iterassoc_filter.adb:20:11-20:12>
+Expr: <Id "I" iterassoc_filter.adb:18:44-18:45>
+  references:    <DefiningName "I" iterassoc_filter.adb:17:11-17:12>
   type:          <ConcreteTypeDecl ["R"] iterassoc_filter.adb:2:4-2:27>
   expected type: <ConcreteTypeDecl ["R"] iterassoc_filter.adb:2:4-2:27>
-Expr: <OpGte ">=" iterassoc_filter.adb:20:29-20:31>
+Expr: <OpMult "*" iterassoc_filter.adb:18:47-18:48>
   references:    None
   type:          None
   expected type: None
-Expr: <Real iterassoc_filter.adb:20:32-20:35>
-  references:    None
-  type:          <ConcreteTypeDecl ["Universal_Real_Type_"] __standard:117:3-117:42>
+Expr: <CallExpr iterassoc_filter.adb:18:49-18:54>
+  references:    <DefiningName "X" iterassoc_filter.adb:5:4-5:5>
+  type:          <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
   expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
-Expr: <Aggregate iterassoc_filter.adb:21:8-21:55>
-  type:          None
+Expr: <Id "X" iterassoc_filter.adb:18:49-18:50>
+  references:    <DefiningName "X" iterassoc_filter.adb:5:4-5:5>
+  type:          <ConcreteTypeDecl ["A"] iterassoc_filter.adb:3:4-3:33>
   expected type: None
-Expr: <Id "R" iterassoc_filter.adb:21:18-21:19>
-  references:    <DefiningName "R" iterassoc_filter.adb:2:9-2:10>
+Expr: <Id "J" iterassoc_filter.adb:18:52-18:53>
+  references:    <DefiningName "J" iterassoc_filter.adb:18:13-18:14>
   type:          <ConcreteTypeDecl ["R"] iterassoc_filter.adb:2:4-2:27>
   expected type: <ConcreteTypeDecl ["R"] iterassoc_filter.adb:2:4-2:27>
-Expr: <RelationOp iterassoc_filter.adb:21:25-21:37>
+
+Resolving xrefs for node <ForLoopIterFilter iterassoc_filter.adb:17:18-17:35>
+*****************************************************************************
+
+Expr: <RelationOp iterassoc_filter.adb:17:23-17:35>
   type:          <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
   expected type: <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
-Expr: <CallExpr iterassoc_filter.adb:21:25-21:30>
+Expr: <CallExpr iterassoc_filter.adb:17:23-17:28>
   references:    <DefiningName "X" iterassoc_filter.adb:5:4-5:5>
   type:          <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
   expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
-Expr: <Id "X" iterassoc_filter.adb:21:25-21:26>
+Expr: <Id "X" iterassoc_filter.adb:17:23-17:24>
   references:    <DefiningName "X" iterassoc_filter.adb:5:4-5:5>
   type:          <ConcreteTypeDecl ["A"] iterassoc_filter.adb:3:4-3:33>
   expected type: None
-Expr: <Id "J" iterassoc_filter.adb:21:28-21:29>
-  references:    <DefiningName "J" iterassoc_filter.adb:21:13-21:14>
+Expr: <Id "I" iterassoc_filter.adb:17:26-17:27>
+  references:    <DefiningName "I" iterassoc_filter.adb:17:11-17:12>
   type:          <ConcreteTypeDecl ["R"] iterassoc_filter.adb:2:4-2:27>
   expected type: <ConcreteTypeDecl ["R"] iterassoc_filter.adb:2:4-2:27>
-Expr: <OpGte ">=" iterassoc_filter.adb:21:31-21:33>
+Expr: <OpGte ">=" iterassoc_filter.adb:17:29-17:31>
   references:    None
   type:          None
   expected type: None
-Expr: <Real iterassoc_filter.adb:21:34-21:37>
+Expr: <Real iterassoc_filter.adb:17:32-17:35>
   references:    None
   type:          <ConcreteTypeDecl ["Universal_Real_Type_"] __standard:117:3-117:42>
   expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
-Expr: <BinOp iterassoc_filter.adb:21:41-21:54>
-  type:          <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
-  expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
-Expr: <CallExpr iterassoc_filter.adb:21:41-21:46>
+
+Resolving xrefs for node <ForLoopIterFilter iterassoc_filter.adb:18:20-18:37>
+*****************************************************************************
+
+Expr: <RelationOp iterassoc_filter.adb:18:25-18:37>
+  type:          <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
+  expected type: <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
+Expr: <CallExpr iterassoc_filter.adb:18:25-18:30>
   references:    <DefiningName "X" iterassoc_filter.adb:5:4-5:5>
   type:          <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
   expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
-Expr: <Id "X" iterassoc_filter.adb:21:41-21:42>
+Expr: <Id "X" iterassoc_filter.adb:18:25-18:26>
   references:    <DefiningName "X" iterassoc_filter.adb:5:4-5:5>
   type:          <ConcreteTypeDecl ["A"] iterassoc_filter.adb:3:4-3:33>
   expected type: None
-Expr: <Id "I" iterassoc_filter.adb:21:44-21:45>
-  references:    <DefiningName "I" iterassoc_filter.adb:20:11-20:12>
+Expr: <Id "J" iterassoc_filter.adb:18:28-18:29>
+  references:    <DefiningName "J" iterassoc_filter.adb:18:13-18:14>
   type:          <ConcreteTypeDecl ["R"] iterassoc_filter.adb:2:4-2:27>
   expected type: <ConcreteTypeDecl ["R"] iterassoc_filter.adb:2:4-2:27>
-Expr: <OpMult "*" iterassoc_filter.adb:21:47-21:48>
+Expr: <OpGte ">=" iterassoc_filter.adb:18:31-18:33>
   references:    None
   type:          None
   expected type: None
-Expr: <CallExpr iterassoc_filter.adb:21:49-21:54>
-  references:    <DefiningName "X" iterassoc_filter.adb:5:4-5:5>
-  type:          <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
+Expr: <Real iterassoc_filter.adb:18:34-18:37>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Real_Type_"] __standard:117:3-117:42>
   expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
-Expr: <Id "X" iterassoc_filter.adb:21:49-21:50>
-  references:    <DefiningName "X" iterassoc_filter.adb:5:4-5:5>
-  type:          <ConcreteTypeDecl ["A"] iterassoc_filter.adb:3:4-3:33>
-  expected type: None
-Expr: <Id "J" iterassoc_filter.adb:21:52-21:53>
-  references:    <DefiningName "J" iterassoc_filter.adb:21:13-21:14>
-  type:          <ConcreteTypeDecl ["R"] iterassoc_filter.adb:2:4-2:27>
-  expected type: <ConcreteTypeDecl ["R"] iterassoc_filter.adb:2:4-2:27>
 
-Resolving xrefs for node <ObjectDecl ["B"] iterassoc_filter.adb:25:7-25:64>
+Resolving xrefs for node <ObjectDecl ["R"] iterassoc_filter.adb:20:4-20:61>
 ***************************************************************************
 
-Expr: <Id "Boolean" iterassoc_filter.adb:25:11-25:18>
+Expr: <Id "Boolean" iterassoc_filter.adb:20:8-20:15>
   references:    <DefiningName "Boolean" __standard:3:8-3:15>
   type:          None
   expected type: None
-Expr: <ParenExpr iterassoc_filter.adb:25:22-25:63>
+Expr: <ParenExpr iterassoc_filter.adb:20:19-20:60>
   type:          <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
   expected type: <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
-Expr: <QuantifiedExpr iterassoc_filter.adb:25:23-25:62>
+Expr: <QuantifiedExpr iterassoc_filter.adb:20:20-20:59>
   type:          <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
   expected type: <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
-Expr: <RelationOp iterassoc_filter.adb:25:55-25:62>
+Expr: <RelationOp iterassoc_filter.adb:20:52-20:59>
   type:          <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
   expected type: <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
-Expr: <Id "F" iterassoc_filter.adb:25:55-25:56>
-  references:    <DefiningName "F" iterassoc_filter.adb:25:31-25:32>
+Expr: <Id "F" iterassoc_filter.adb:20:52-20:53>
+  references:    <DefiningName "F" iterassoc_filter.adb:20:28-20:29>
   type:          <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
   expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
-Expr: <OpGt ">" iterassoc_filter.adb:25:57-25:58>
+Expr: <OpGt ">" iterassoc_filter.adb:20:54-20:55>
   references:    None
   type:          None
   expected type: None
-Expr: <Real iterassoc_filter.adb:25:59-25:62>
+Expr: <Real iterassoc_filter.adb:20:56-20:59>
   references:    None
   type:          <ConcreteTypeDecl ["Universal_Real_Type_"] __standard:117:3-117:42>
   expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
 
-Resolving xrefs for node <ForLoopSpec iterassoc_filter.adb:25:31-25:51>
+Resolving xrefs for node <ForLoopSpec iterassoc_filter.adb:20:28-20:48>
 ***********************************************************************
 
-Expr: <Id "X" iterassoc_filter.adb:25:36-25:37>
+Expr: <Id "X" iterassoc_filter.adb:20:33-20:34>
   references:    <DefiningName "X" iterassoc_filter.adb:5:4-5:5>
   type:          <ConcreteTypeDecl ["A"] iterassoc_filter.adb:3:4-3:33>
   expected type: None
-Expr: <RelationOp iterassoc_filter.adb:25:43-25:51>
+
+Resolving xrefs for node <ForLoopIterFilter iterassoc_filter.adb:20:35-20:48>
+*****************************************************************************
+
+Expr: <RelationOp iterassoc_filter.adb:20:40-20:48>
   type:          <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
   expected type: <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
-Expr: <Id "F" iterassoc_filter.adb:25:43-25:44>
-  references:    <DefiningName "F" iterassoc_filter.adb:25:31-25:32>
+Expr: <Id "F" iterassoc_filter.adb:20:40-20:41>
+  references:    <DefiningName "F" iterassoc_filter.adb:20:28-20:29>
   type:          <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
   expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
-Expr: <OpGte ">=" iterassoc_filter.adb:25:45-25:47>
+Expr: <OpGte ">=" iterassoc_filter.adb:20:42-20:44>
   references:    None
   type:          None
   expected type: None
-Expr: <Real iterassoc_filter.adb:25:48-25:51>
+Expr: <Real iterassoc_filter.adb:20:45-20:48>
   references:    None
   type:          <ConcreteTypeDecl ["Universal_Real_Type_"] __standard:117:3-117:42>
   expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
 
-Resolving xrefs for node <ObjectDecl ["C"] iterassoc_filter.adb:26:7-26:78>
+Resolving xrefs for node <ObjectDecl ["S"] iterassoc_filter.adb:22:4-22:75>
 ***************************************************************************
 
-Expr: <Id "Boolean" iterassoc_filter.adb:26:11-26:18>
+Expr: <Id "Boolean" iterassoc_filter.adb:22:8-22:15>
   references:    <DefiningName "Boolean" __standard:3:8-3:15>
   type:          None
   expected type: None
-Expr: <ParenExpr iterassoc_filter.adb:26:22-26:77>
+Expr: <ParenExpr iterassoc_filter.adb:22:19-22:74>
   type:          <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
   expected type: <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
-Expr: <QuantifiedExpr iterassoc_filter.adb:26:23-26:76>
+Expr: <QuantifiedExpr iterassoc_filter.adb:22:20-22:73>
   type:          <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
   expected type: <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
-Expr: <RelationOp iterassoc_filter.adb:26:65-26:76>
+Expr: <RelationOp iterassoc_filter.adb:22:62-22:73>
   type:          <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
   expected type: <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
-Expr: <CallExpr iterassoc_filter.adb:26:65-26:70>
+Expr: <CallExpr iterassoc_filter.adb:22:62-22:67>
   references:    <DefiningName "X" iterassoc_filter.adb:5:4-5:5>
   type:          <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
   expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
-Expr: <Id "X" iterassoc_filter.adb:26:65-26:66>
+Expr: <Id "X" iterassoc_filter.adb:22:62-22:63>
   references:    <DefiningName "X" iterassoc_filter.adb:5:4-5:5>
   type:          <ConcreteTypeDecl ["A"] iterassoc_filter.adb:3:4-3:33>
   expected type: None
-Expr: <Id "I" iterassoc_filter.adb:26:68-26:69>
-  references:    <DefiningName "I" iterassoc_filter.adb:20:11-20:12>
+Expr: <Id "I" iterassoc_filter.adb:22:65-22:66>
+  references:    <DefiningName "I" iterassoc_filter.adb:17:11-17:12>
   type:          <ConcreteTypeDecl ["R"] iterassoc_filter.adb:2:4-2:27>
   expected type: <ConcreteTypeDecl ["R"] iterassoc_filter.adb:2:4-2:27>
-Expr: <OpGt ">" iterassoc_filter.adb:26:71-26:72>
+Expr: <OpGt ">" iterassoc_filter.adb:22:68-22:69>
   references:    None
   type:          None
   expected type: None
-Expr: <Real iterassoc_filter.adb:26:73-26:76>
+Expr: <Real iterassoc_filter.adb:22:70-22:73>
   references:    None
   type:          <ConcreteTypeDecl ["Universal_Real_Type_"] __standard:117:3-117:42>
   expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
 
-Resolving xrefs for node <ForLoopSpec iterassoc_filter.adb:26:32-26:61>
+Resolving xrefs for node <ForLoopSpec iterassoc_filter.adb:22:29-22:58>
 ***********************************************************************
 
-Expr: <BinOp iterassoc_filter.adb:26:37-26:43>
+Expr: <BinOp iterassoc_filter.adb:22:34-22:40>
   type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
   expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
-Expr: <Int iterassoc_filter.adb:26:37-26:38>
+Expr: <Int iterassoc_filter.adb:22:34-22:35>
   references:    None
   type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
   expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
-Expr: <OpDoubleDot ".." iterassoc_filter.adb:26:39-26:41>
+Expr: <OpDoubleDot ".." iterassoc_filter.adb:22:36-22:38>
   references:    None
   type:          None
   expected type: None
-Expr: <Int iterassoc_filter.adb:26:42-26:43>
+Expr: <Int iterassoc_filter.adb:22:39-22:40>
   references:    None
   type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
   expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
-Expr: <RelationOp iterassoc_filter.adb:26:49-26:61>
+
+Resolving xrefs for node <ForLoopIterFilter iterassoc_filter.adb:22:41-22:58>
+*****************************************************************************
+
+Expr: <RelationOp iterassoc_filter.adb:22:46-22:58>
   type:          <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
   expected type: <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
-Expr: <CallExpr iterassoc_filter.adb:26:49-26:54>
+Expr: <CallExpr iterassoc_filter.adb:22:46-22:51>
   references:    <DefiningName "X" iterassoc_filter.adb:5:4-5:5>
   type:          <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
   expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
-Expr: <Id "X" iterassoc_filter.adb:26:49-26:50>
+Expr: <Id "X" iterassoc_filter.adb:22:46-22:47>
   references:    <DefiningName "X" iterassoc_filter.adb:5:4-5:5>
   type:          <ConcreteTypeDecl ["A"] iterassoc_filter.adb:3:4-3:33>
   expected type: None
-Expr: <Id "I" iterassoc_filter.adb:26:52-26:53>
-  references:    <DefiningName "I" iterassoc_filter.adb:20:11-20:12>
+Expr: <Id "I" iterassoc_filter.adb:22:49-22:50>
+  references:    <DefiningName "I" iterassoc_filter.adb:17:11-17:12>
   type:          <ConcreteTypeDecl ["R"] iterassoc_filter.adb:2:4-2:27>
   expected type: <ConcreteTypeDecl ["R"] iterassoc_filter.adb:2:4-2:27>
-Expr: <OpGte ">=" iterassoc_filter.adb:26:55-26:57>
+Expr: <OpGte ">=" iterassoc_filter.adb:22:52-22:54>
   references:    None
   type:          None
   expected type: None
-Expr: <Real iterassoc_filter.adb:26:58-26:61>
+Expr: <Real iterassoc_filter.adb:22:55-22:58>
   references:    None
   type:          <ConcreteTypeDecl ["Universal_Real_Type_"] __standard:117:3-117:42>
   expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
 
-Resolving xrefs for node <NullStmt iterassoc_filter.adb:28:7-28:12>
-*******************************************************************
+Resolving xrefs for node <NullStmt iterassoc_filter.adb:24:4-24:9>
+******************************************************************
+
 
+Resolving xrefs for node <EndName iterassoc_filter.adb:25:5-25:21>
+******************************************************************
+
+Expr: <EndName iterassoc_filter.adb:25:5-25:21>
+  references:    <DefiningName "Iterassoc_Filter" iterassoc_filter.adb:1:11-1:27>
+  type:          None
+  expected type: None
+Expr: <Id "Iterassoc_Filter" iterassoc_filter.adb:25:5-25:21>
+  references:    <DefiningName "Iterassoc_Filter" iterassoc_filter.adb:1:11-1:27>
+  type:          None
+  expected type: None
 
 
 Done.
diff --git a/testsuite/tests/name_resolution/reduce_attr/acc.adb b/testsuite/tests/name_resolution/reduce_attr/acc.adb
index 741e205db..b507fab19 100644
--- a/testsuite/tests/name_resolution/reduce_attr/acc.adb
+++ b/testsuite/tests/name_resolution/reduce_attr/acc.adb
@@ -16,10 +16,10 @@ procedure Acc is
       Acc : constant Accumulator :=
         [for Val of M when Val > 100.0 => (Val, 1)]
            'Reduce(Accumulate, (Sum => 0.0, Count => 0));
-      pragma Test_Statement;
    begin
       return Acc.Sum / Real(Acc.Count);
    end Average_of_Values_Greater_Than_100;
+   pragma Test_Block;
 begin
    null;
 end Acc;
diff --git a/testsuite/tests/name_resolution/reduce_attr/test.out b/testsuite/tests/name_resolution/reduce_attr/test.out
index c08a4bdab..fdb7c1360 100644
--- a/testsuite/tests/name_resolution/reduce_attr/test.out
+++ b/testsuite/tests/name_resolution/reduce_attr/test.out
@@ -260,6 +260,22 @@ Expr: <Id "Reduced" reduce.adb:55:61-55:68>
 Analyzing acc.adb
 #################
 
+Resolving xrefs for node <SubpSpec acc.adb:15:4-15:72>
+******************************************************
+
+Expr: <Id "Real" acc.adb:15:68-15:72>
+  references:    <DefiningName "Real" acc.adb:3:9-3:13>
+  type:          None
+  expected type: None
+
+Resolving xrefs for node <ParamSpec ["M"] acc.adb:15:49-15:59>
+**************************************************************
+
+Expr: <Id "Matrix" acc.adb:15:53-15:59>
+  references:    <DefiningName "Matrix" acc.adb:4:9-4:15>
+  type:          None
+  expected type: None
+
 Resolving xrefs for node <ObjectDecl ["Acc"] acc.adb:16:7-18:58>
 ****************************************************************
 
@@ -275,21 +291,6 @@ Expr: <Id "M" acc.adb:17:21-17:22>
   references:    <DefiningName "M" acc.adb:15:49-15:50>
   type:          <ConcreteTypeDecl ["Matrix"] acc.adb:4:4-4:69>
   expected type: None
-Expr: <RelationOp acc.adb:17:28-17:39>
-  type:          <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
-  expected type: <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
-Expr: <Id "Val" acc.adb:17:28-17:31>
-  references:    <DefiningName "Val" acc.adb:17:14-17:17>
-  type:          <ConcreteTypeDecl ["Real"] acc.adb:3:4-3:26>
-  expected type: <ConcreteTypeDecl ["Real"] acc.adb:3:4-3:26>
-Expr: <OpGt ">" acc.adb:17:32-17:33>
-  references:    None
-  type:          None
-  expected type: None
-Expr: <Real acc.adb:17:34-17:39>
-  references:    None
-  type:          <ConcreteTypeDecl ["Universal_Real_Type_"] __standard:117:3-117:42>
-  expected type: <ConcreteTypeDecl ["Real"] acc.adb:3:4-3:26>
 Expr: <Aggregate acc.adb:17:43-17:51>
   type:          <ConcreteTypeDecl ["Accumulator"] acc.adb:6:4-9:15>
   expected type: <ConcreteTypeDecl ["Accumulator"] acc.adb:6:4-9:15>
@@ -329,6 +330,80 @@ Expr: <Int acc.adb:18:54-18:55>
   type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
   expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
 
+Resolving xrefs for node <ForLoopIterFilter acc.adb:17:23-17:39>
+****************************************************************
+
+Expr: <RelationOp acc.adb:17:28-17:39>
+  type:          <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
+  expected type: <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
+Expr: <Id "Val" acc.adb:17:28-17:31>
+  references:    <DefiningName "Val" acc.adb:17:14-17:17>
+  type:          <ConcreteTypeDecl ["Real"] acc.adb:3:4-3:26>
+  expected type: <ConcreteTypeDecl ["Real"] acc.adb:3:4-3:26>
+Expr: <OpGt ">" acc.adb:17:32-17:33>
+  references:    None
+  type:          None
+  expected type: None
+Expr: <Real acc.adb:17:34-17:39>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Real_Type_"] __standard:117:3-117:42>
+  expected type: <ConcreteTypeDecl ["Real"] acc.adb:3:4-3:26>
+
+Resolving xrefs for node <ReturnStmt acc.adb:20:7-20:40>
+********************************************************
+
+Expr: <BinOp acc.adb:20:14-20:39>
+  type:          <ConcreteTypeDecl ["Real"] acc.adb:3:4-3:26>
+  expected type: <ConcreteTypeDecl ["Real"] acc.adb:3:4-3:26>
+Expr: <DottedName acc.adb:20:14-20:21>
+  references:    <DefiningName "Sum" acc.adb:7:7-7:10>
+  type:          <ConcreteTypeDecl ["Real"] acc.adb:3:4-3:26>
+  expected type: <ConcreteTypeDecl ["Real"] acc.adb:3:4-3:26>
+Expr: <Id "Acc" acc.adb:20:14-20:17>
+  references:    <DefiningName "Acc" acc.adb:16:7-16:10>
+  type:          <ConcreteTypeDecl ["Accumulator"] acc.adb:6:4-9:15>
+  expected type: <ConcreteTypeDecl ["Accumulator"] acc.adb:6:4-9:15>
+Expr: <Id "Sum" acc.adb:20:18-20:21>
+  references:    <DefiningName "Sum" acc.adb:7:7-7:10>
+  type:          <ConcreteTypeDecl ["Real"] acc.adb:3:4-3:26>
+  expected type: <ConcreteTypeDecl ["Real"] acc.adb:3:4-3:26>
+Expr: <OpDiv "/" acc.adb:20:22-20:23>
+  references:    None
+  type:          None
+  expected type: None
+Expr: <CallExpr acc.adb:20:24-20:39>
+  references:    <DefiningName "Real" acc.adb:3:9-3:13>
+  type:          <ConcreteTypeDecl ["Real"] acc.adb:3:4-3:26>
+  expected type: <ConcreteTypeDecl ["Real"] acc.adb:3:4-3:26>
+Expr: <Id "Real" acc.adb:20:24-20:28>
+  references:    <DefiningName "Real" acc.adb:3:9-3:13>
+  type:          <ConcreteTypeDecl ["Real"] acc.adb:3:4-3:26>
+  expected type: None
+Expr: <DottedName acc.adb:20:29-20:38>
+  references:    <DefiningName "Count" acc.adb:8:7-8:12>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <Id "Acc" acc.adb:20:29-20:32>
+  references:    <DefiningName "Acc" acc.adb:16:7-16:10>
+  type:          <ConcreteTypeDecl ["Accumulator"] acc.adb:6:4-9:15>
+  expected type: <ConcreteTypeDecl ["Accumulator"] acc.adb:6:4-9:15>
+Expr: <Id "Count" acc.adb:20:33-20:38>
+  references:    <DefiningName "Count" acc.adb:8:7-8:12>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+
+Resolving xrefs for node <EndName acc.adb:21:8-21:42>
+*****************************************************
+
+Expr: <EndName acc.adb:21:8-21:42>
+  references:    <DefiningName "Average_of_Values_Greater_Than_100" acc.adb:15:13-15:47>
+  type:          None
+  expected type: None
+Expr: <Id "Average_of_Values_Greater_Than_100" acc.adb:21:8-21:42>
+  references:    <DefiningName "Average_of_Values_Greater_Than_100" acc.adb:15:13-15:47>
+  type:          None
+  expected type: None
+
 
 Analyzing countc.adb
 ####################