From: Piotr Trojanek <trojanek@adacore.com>
Date: Wed, 3 Mar 2021 20:19:39 +0000 (+0100)
Subject: [Ada] Fix Is_Volatile_Function for functions declared in protected bodies
X-Git-Tag: upstream/12.2.0~7174
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ccf0dee109ba0c71ca2b6e093a874daf1671ecf0;p=platform%2Fupstream%2Fgcc.git

[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 --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
index 6376b4e..6481d86 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