From afed612dc569a353dc08181446b026c6a6953f19 Mon Sep 17 00:00:00 2001
From: Piotr Trojanek <trojanek@adacore.com>
Date: Tue, 24 Nov 2020 00:31:49 +0100
Subject: [PATCH] [Ada] Refactor repeated code for Callable and Terminated
attributes
gcc/ada/
* sem_attr.adb (Analyze_Attribute): Merge identical code for
Callable and Terminated attributes; refactor calls to Set_Etype
occurring in both THEN and ELSE branches of an IF statement for
attribute Storage_Size.
---
gcc/ada/sem_attr.adb | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/gcc/ada/sem_attr.adb b/gcc/ada/sem_attr.adb
index 285b2606b7dc..865bbae4885a 100644
--- a/gcc/ada/sem_attr.adb
+++ b/gcc/ada/sem_attr.adb
@@ -3351,7 +3351,9 @@ package body Sem_Attr is
-- Callable --
--------------
- when Attribute_Callable =>
+ when Attribute_Callable
+ | Attribute_Terminated
+ =>
Check_E0;
Set_Etype (N, Standard_Boolean);
Check_Task_Prefix;
@@ -6121,6 +6123,8 @@ package body Sem_Attr is
Check_Restriction (No_Obsolescent_Features, P);
elsif Is_Access_Type (P_Type) then
+ Set_Etype (N, Universal_Integer);
+
if Ekind (P_Type) = E_Access_Subprogram_Type then
Error_Attr_P
("cannot use % attribute for access-to-subprogram type");
@@ -6130,7 +6134,6 @@ package body Sem_Attr is
and then Is_Type (Entity (P))
then
Check_Type;
- Set_Etype (N, Universal_Integer);
-- Validate_Remote_Access_To_Class_Wide_Type for attribute
-- Storage_Size since this attribute is not defined for
@@ -6143,7 +6146,6 @@ package body Sem_Attr is
else
Check_Task_Prefix;
- Set_Etype (N, Universal_Integer);
end if;
else
@@ -6294,10 +6296,7 @@ package body Sem_Attr is
-- Terminated --
----------------
- when Attribute_Terminated =>
- Check_E0;
- Set_Etype (N, Standard_Boolean);
- Check_Task_Prefix;
+ -- Shares processing with Callable attribute
----------------
-- To_Address --
--
GitLab