2011-11-04 Robert Dewar <dewar@adacore.com>
+ * exp_ch2.adb (Expand_Entity_Reference): Extend handling of
+ atomic sync to type case.
+ * sem_prag.adb (Process_Suppress_Unsuppress): Atomic Sync can
+ apply to types.
+
+2011-11-04 Robert Dewar <dewar@adacore.com>
+
* sem_warn.adb (Warn_On_Useless_Assignment): More accurate test
for call vs assign.
* gcc-interface/Make-lang.in: Update dependencies.
-- Set Atomic_Sync_Required if necessary for atomic variable
- if Is_Atomic (E) then
+ if Nkind_In (N, N_Identifier, N_Expanded_Name)
+ and then (Is_Atomic (E) or else Is_Atomic (Etype (E)))
+ then
declare
Set : Boolean;
MLoc : Node_Id;
elsif Debug_Flag_Dot_D then
Set := False;
- -- Otherwise setting comes from Atomic_Synchronization state
+ -- If variable is atomic, but type is not, setting depends on
+ -- disable/enable state for the variable.
- else
+ elsif Is_Atomic (E) and then not Is_Atomic (Etype (E)) then
Set := not Atomic_Synchronization_Disabled (E);
+
+ -- If variable is not atomic, but its type is atomic, setting
+ -- depends on disable/enable state for the type.
+
+ elsif not Is_Atomic (E) and then Is_Atomic (Etype (E)) then
+ Set := not Atomic_Synchronization_Disabled (Etype (E));
+
+ -- Else both variable and type are atomic (see outer if), and we
+ -- disable if either variable or its type have sync disabled.
+
+ else
+ Set := (not Atomic_Synchronization_Disabled (E))
+ and then
+ (not Atomic_Synchronization_Disabled (Etype (E)));
end if;
-- Set flag if required
and then not Is_Atomic (E)
then
Error_Msg_N
- ("pragma & requires atomic variable",
+ ("pragma & requires atomic type or variable",
Pragma_Identifier (Original_Node (N)));
end if;