From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1914) id 01DEB3943413; Wed, 16 Jun 2021 08:46:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 01DEB3943413 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Pierre-Marie de Rodat To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-1522] [Ada] Ignore volatile restrictions in preanalysis X-Act-Checkin: gcc X-Git-Author: Piotr Trojanek X-Git-Refname: refs/heads/master X-Git-Oldrev: 3feba0a578c364e6ca44ad5f954a30dc55e98065 X-Git-Newrev: 1a9ff8d39c1f5a63755f2a8bb0a982c7af4ee817 Message-Id: <20210616084615.01DEB3943413@sourceware.org> Date: Wed, 16 Jun 2021 08:46:15 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2021 08:46:15 -0000 https://gcc.gnu.org/g:1a9ff8d39c1f5a63755f2a8bb0a982c7af4ee817 commit r12-1522-g1a9ff8d39c1f5a63755f2a8bb0a982c7af4ee817 Author: Piotr Trojanek Date: Wed Mar 3 20:15:56 2021 +0100 [Ada] Ignore volatile restrictions in preanalysis gcc/ada/ * 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: --- gcc/ada/sem_util.adb | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index 68e9a089eaf..6376b4e6b62 100644 --- 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 begin + -- 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.