===================================================================
@@ -2062,6 +2062,7 @@
procedure Check_Function_Writable_Actuals (N : Node_Id) is
Writable_Actuals_List : Elist_Id := No_Elist;
Identifiers_List : Elist_Id := No_Elist;
+ Aggr_Error_Node : Node_Id := Empty;
Error_Node : Node_Id := Empty;
procedure Collect_Identifiers (N : Node_Id);
@@ -2119,6 +2120,14 @@
then
return Skip;
+ -- For rewriten nodes we continue the traversal in the original
+ -- subtree. Needed to handle in aggregates original expressions
+ -- extracted from the tree by Remove_Side_Effects.
+
+ elsif Is_Rewrite_Substitution (N) then
+ Collect_Identifiers (Original_Node (N));
+ return Skip;
+
-- For now we skip aggregate discriminants, since they require
-- performing the analysis in two phases to identify conflicts:
-- first one analyzing discriminants and second one analyzing
@@ -2600,6 +2609,75 @@
end if;
end if;
end;
+
+ -- For an array aggregate a discrete_choice_list that has a
+ -- nonstatic range, is considered as two or more separate
+ -- occurrences of the expression (RM 6.20/3)
+
+ elsif Is_Array_Type (Etype (N))
+ and then Nkind (N) = N_Aggregate
+ and then Present (Aggregate_Bounds (N))
+ and then not Compile_Time_Known_Bounds (Etype (N))
+ then
+ -- Collect identifiers found in the dynamic bounds
+
+ declare
+ Count_Components : Natural := 0;
+ Low, High : Node_Id;
+
+ begin
+ Assoc := First (Component_Associations (N));
+ while Present (Assoc) loop
+ Choice := First (Choices (Assoc));
+ while Present (Choice) loop
+ if Nkind_In (Choice, N_Range,
+ N_Subtype_Indication)
+ or else (Is_Entity_Name (Choice)
+ and then Is_Type (Entity (Choice)))
+ then
+ Get_Index_Bounds (Choice, Low, High);
+
+ if not Compile_Time_Known_Value (Low) then
+ Collect_Identifiers (Low);
+
+ if No (Aggr_Error_Node) then
+ Aggr_Error_Node := Low;
+ end if;
+ end if;
+
+ if not Compile_Time_Known_Value (High) then
+ Collect_Identifiers (High);
+
+ if No (Aggr_Error_Node) then
+ Aggr_Error_Node := High;
+ end if;
+ end if;
+
+ -- For the purposes of this check it is enough to
+ -- consider that we cover a single component since
+ -- since the RM rule is violated as far as I find
+ -- more than one component.
+
+ else
+ Count_Components := Count_Components + 1;
+
+ if No (Aggr_Error_Node)
+ and then Count_Components > 1
+ then
+ Aggr_Error_Node := Choice;
+ end if;
+
+ if not Compile_Time_Known_Value (Choice) then
+ Collect_Identifiers (Choice);
+ end if;
+ end if;
+
+ Next (Choice);
+ end loop;
+
+ Next (Assoc);
+ end loop;
+ end;
end if;
-- Handle ancestor part of extension aggregates
@@ -2679,6 +2757,18 @@
return;
end if;
+ -- Check violation of RM 6.20/3 in aggregates
+
+ if Present (Aggr_Error_Node)
+ and then Writable_Actuals_List /= No_Elist
+ then
+ Error_Msg_N
+ ("value may be affected by call in other component because they "
+ & "are evaluated in unspecified order",
+ Node (First_Elmt (Writable_Actuals_List)));
+ return;
+ end if;
+
-- Check if some writable argument of a function is referenced
if Writable_Actuals_List /= No_Elist
This patch extends the machinery which detects dangerous order dependencies caused by out-mode parameters of Ada 2012 functions (AI-0144) to detect the error in array aggregates that have a nonstatic range (RM 6.20/3). The compiler now catches the error in the following sources: pragma Ada_2012; procedure test_aggr is function f (a : in out Integer) return Integer is begin a := 2 * a; return a; end; type Arr is array (Natural range <>) of Integer; procedure Proc (A : Arr) is begin null; end; I : Integer := 0; Nonstatic_Bound : Integer := F (I); begin I := F (I); -- Ensure that the compiler does not handle I as constant Proc ((1 .. I => F (I))); -- ERROR end; Tested on x86_64-pc-linux-gnu, committed on trunk 2015-05-26 Javier Miranda <miranda@adacore.com> * sem_util.adb (Check_Function_Writable_Actuals): Add missing support to check the violation of writable actuals in array aggregates that have a nonstatic range.