public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r12-2067] [Ada] Spurious initialization of element iterators in "for of" loops
@ 2021-07-06 14:49 Pierre-Marie de Rodat
0 siblings, 0 replies; only message in thread
From: Pierre-Marie de Rodat @ 2021-07-06 14:49 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:160a6c31074afde0bfc835591a95653c5e65cc45
commit r12-2067-g160a6c31074afde0bfc835591a95653c5e65cc45
Author: Justin Squirek <squirek@adacore.com>
Date: Sat May 8 00:28:55 2021 -0400
[Ada] Spurious initialization of element iterators in "for of" loops
gcc/ada/
* exp_ch5.adb (Expand_Formal_Container_Element_Loop): Remove
legacy expansion of element iterators, and use expansion form
used by unconstrained element types in the general case.
Diff:
---
gcc/ada/exp_ch5.adb | 68 ++++++++++++-----------------------------------------
1 file changed, 15 insertions(+), 53 deletions(-)
diff --git a/gcc/ada/exp_ch5.adb b/gcc/ada/exp_ch5.adb
index 2cc8b64f083..3e65084c65f 100644
--- a/gcc/ada/exp_ch5.adb
+++ b/gcc/ada/exp_ch5.adb
@@ -4077,7 +4077,6 @@ package body Exp_Ch5 is
Make_Defining_Identifier (Loc,
Chars => New_External_Name (Chars (Element), 'C'));
Elmt_Decl : Node_Id;
- Elmt_Ref : Node_Id;
Element_Op : constant Entity_Id :=
Get_Iterable_Type_Primitive (Container_Typ, Name_Element);
@@ -4088,19 +4087,10 @@ package body Exp_Ch5 is
begin
-- For an element iterator, the Element aspect must be present,
- -- (this is checked during analysis) and the expansion takes the form:
+ -- (this is checked during analysis).
- -- Cursor : Cursor_Type := First (Container);
- -- Elmt : Element_Type;
- -- while Has_Element (Cursor, Container) loop
- -- Elmt := Element (Container, Cursor);
- -- <original loop statements>
- -- Cursor := Next (Container, Cursor);
- -- end loop;
-
- -- However this expansion is not legal if the element is indefinite.
- -- In that case we create a block to hold a variable declaration
- -- initialized with a call to Element, and generate:
+ -- We create a block to hold a variable declaration initialized with
+ -- a call to Element, and generate:
-- Cursor : Cursor_Type := First (Container);
-- while Has_Element (Cursor, Container) loop
@@ -4132,48 +4122,20 @@ package body Exp_Ch5 is
Defining_Identifier => Element,
Object_Definition => New_Occurrence_Of (Etype (Element_Op), Loc));
- if not Is_Constrained (Etype (Element_Op)) then
- Set_Expression (Elmt_Decl,
- Make_Function_Call (Loc,
- Name => New_Occurrence_Of (Element_Op, Loc),
- Parameter_Associations => New_List (
- Convert_To_Iterable_Type (Container, Loc),
- New_Occurrence_Of (Cursor, Loc))));
-
- Set_Statements (New_Loop,
- New_List
- (Make_Block_Statement (Loc,
- Declarations => New_List (Elmt_Decl),
- Handled_Statement_Sequence =>
- Make_Handled_Sequence_Of_Statements (Loc,
- Statements => Stats))));
-
- else
- Elmt_Ref :=
- Make_Assignment_Statement (Loc,
- Name => New_Occurrence_Of (Element, Loc),
- Expression =>
- Make_Function_Call (Loc,
- Name => New_Occurrence_Of (Element_Op, Loc),
- Parameter_Associations => New_List (
- Convert_To_Iterable_Type (Container, Loc),
- New_Occurrence_Of (Cursor, Loc))));
-
- Prepend (Elmt_Ref, Stats);
-
- -- The element is assignable in the expanded code
-
- Set_Assignment_OK (Name (Elmt_Ref));
-
- -- The loop is rewritten as a block, to hold the element declaration
-
- New_Loop :=
- Make_Block_Statement (Loc,
- Declarations => New_List (Elmt_Decl),
+ Set_Expression (Elmt_Decl,
+ Make_Function_Call (Loc,
+ Name => New_Occurrence_Of (Element_Op, Loc),
+ Parameter_Associations => New_List (
+ Convert_To_Iterable_Type (Container, Loc),
+ New_Occurrence_Of (Cursor, Loc))));
+
+ Set_Statements (New_Loop,
+ New_List
+ (Make_Block_Statement (Loc,
+ Declarations => New_List (Elmt_Decl),
Handled_Statement_Sequence =>
Make_Handled_Sequence_Of_Statements (Loc,
- Statements => New_List (New_Loop)));
- end if;
+ Statements => Stats))));
-- The element is only modified in expanded code, so it appears as
-- unassigned to the warning machinery. We must suppress this spurious
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-07-06 14:49 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-06 14:49 [gcc r12-2067] [Ada] Spurious initialization of element iterators in "for of" loops Pierre-Marie de Rodat
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).