diff mbox series

[Ada] Ignore volatile restrictions in preanalysis

Message ID 20210616084356.GA96276@adacore.com
State New
Headers show
Series [Ada] Ignore volatile restrictions in preanalysis | expand

Commit Message

Pierre-Marie de Rodat June 16, 2021, 8:43 a.m. UTC
When detecting references to volatile objects in expressions of the
expression functions we couldn't determine the enclosing function. This
was because we examined a copy of the expression made for preanalysis
and this copy is not properly decorated. Consequently, we wrongly
rejected valid references like:

   Data : Integer
     with Atomic, Async_Readers => True, Async_Writers => True;

   function F return Integer is (Data) with Volatile_Function;

This patch effectively disables the detection of references to volatile
objects in preanalysis by assuming all such references to be legal.

Tested on x86_64-pc-linux-gnu, committed on trunk


	* sem_util.adb (Is_OK_Volatile_Context): All references to
	volatile objects are legal in preanalysis.
	(Within_Volatile_Function): Previously it was wrongly called on
	Empty entities; now it is only called on E_Return_Statement,
	which allow the body to be greatly simplified.
diff mbox series


diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
--- a/gcc/ada/sem_util.adb
+++ b/gcc/ada/sem_util.adb
@@ -18871,27 +18871,14 @@  package body Sem_Util is
       function Within_Volatile_Function (Id : Entity_Id) return Boolean is
-         Func_Id : Entity_Id;
+         pragma Assert (Ekind (Id) = E_Return_Statement);
-      begin
-         --  Traverse the scope stack looking for a [generic] function
-         Func_Id := Id;
-         while Present (Func_Id) and then Func_Id /= Standard_Standard loop
-            if Ekind (Func_Id) in E_Function | E_Generic_Function then
-               --  ??? This routine could just use Return_Applies_To, but it
-               --  is currently wrongly called by unanalyzed return statements
-               --  coming from expression functions.
-               pragma Assert (Func_Id = Return_Applies_To (Id));
+         Func_Id : constant Entity_Id := Return_Applies_To (Id);
-               return Is_Volatile_Function (Func_Id);
-            end if;
-            Func_Id := Scope (Func_Id);
-         end loop;
+      begin
+         pragma Assert (Ekind (Func_Id) in E_Function | E_Generic_Function);
-         return False;
+         return Is_Volatile_Function (Func_Id);
       end Within_Volatile_Function;
       --  Local variables
@@ -18901,6 +18888,15 @@  package body Sem_Util is
    --  Start of processing for Is_OK_Volatile_Context
+      --  Ignore context restriction when doing preanalysis, e.g. on a copy of
+      --  an expression function, because this copy is not fully decorated and
+      --  it is not possible to reliably decide the legality of the context.
+      --  Any violations will be reported anyway when doing the full analysis.
+      if not Full_Analysis then
+         return True;
+      end if;
       --  For actual parameters within explicit parameter associations switch
       --  the context to the corresponding subprogram call.