public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r12-1523] [Ada] Fix Is_Volatile_Function for functions declared in protected bodies
@ 2021-06-16  8:46 Pierre-Marie de Rodat
  0 siblings, 0 replies; only message in thread
From: Pierre-Marie de Rodat @ 2021-06-16  8:46 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:ccf0dee109ba0c71ca2b6e093a874daf1671ecf0

commit r12-1523-gccf0dee109ba0c71ca2b6e093a874daf1671ecf0
Author: Piotr Trojanek <trojanek@adacore.com>
Date:   Wed Mar 3 21:19:39 2021 +0100

    [Ada] Fix Is_Volatile_Function for functions declared in protected bodies
    
    gcc/ada/
    
            * sem_util.adb (Is_Volatile_Function): Follow the exact wording
            of SPARK (regarding volatile functions) and Ada (regarding
            protected functions).

Diff:
---
 gcc/ada/sem_util.adb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
index 6376b4e6b62..6481d86a835 100644
--- a/gcc/ada/sem_util.adb
+++ b/gcc/ada/sem_util.adb
@@ -21105,9 +21105,11 @@ package body Sem_Util is
    begin
       pragma Assert (Ekind (Func_Id) in E_Function | E_Generic_Function);
 
-      --  A function declared within a protected type is volatile
+      --  A protected function is volatile
 
-      if Is_Protected_Type (Scope (Func_Id)) then
+      if Nkind (Parent (Unit_Declaration_Node (Func_Id))) =
+           N_Protected_Definition
+      then
          return True;
 
       --  An instance of Ada.Unchecked_Conversion is a volatile function if


^ permalink raw reply	[flat|nested] only message in thread
only message in thread, other threads:[~2021-06-16  8:46 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-16  8:46 [gcc r12-1523] [Ada] Fix Is_Volatile_Function for functions declared in protected bodies 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).