aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Trojanek <trojanek@adacore.com>2022-07-25 22:41:21 +0200
committerMarc Poulhiès <poulhies@adacore.com>2022-09-05 09:21:05 +0200
commit645d1208bf948aed1d6030ca2e9d1510e7459a95 (patch)
treea8cd494599973050e8dce6b27331c21dd5002c24
parent95d9823d289fa8fe7be0a299993027f5e6e7824f (diff)
downloadgcc-645d1208bf948aed1d6030ca2e9d1510e7459a95.zip
gcc-645d1208bf948aed1d6030ca2e9d1510e7459a95.tar.gz
gcc-645d1208bf948aed1d6030ca2e9d1510e7459a95.tar.bz2
[Ada] Fix detection of unused warning suppression
The comment for Warnings_Off says: "clients should generally not test this flag directly, but instead use function Has_Warnings_Off". Primarily a code cleanup, as this only affects minor a corner case. gcc/ada/ * sem_ch13.adb (Validate_Unchecked_Conversions): Use Has_Warnings_Off. * sem_elab.adb (Check_Internal_Call_Continue): Likewise.
-rw-r--r--gcc/ada/sem_ch13.adb4
-rw-r--r--gcc/ada/sem_elab.adb4
2 files changed, 5 insertions, 3 deletions
diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb
index 2cdd157..4d1644b 100644
--- a/gcc/ada/sem_ch13.adb
+++ b/gcc/ada/sem_ch13.adb
@@ -17726,7 +17726,9 @@ package body Sem_Ch13 is
begin
-- Skip if function marked as warnings off
- if Warnings_Off (Act_Unit) or else Serious_Errors_Detected > 0 then
+ if Has_Warnings_Off (Act_Unit)
+ or else Serious_Errors_Detected > 0
+ then
goto Continue;
end if;
diff --git a/gcc/ada/sem_elab.adb b/gcc/ada/sem_elab.adb
index c530392..b8e3fb6 100644
--- a/gcc/ada/sem_elab.adb
+++ b/gcc/ada/sem_elab.adb
@@ -18767,9 +18767,9 @@ package body Sem_Elab is
T : constant Entity_Id := Etype (First_Formal (E));
begin
if Is_Controlled (T) then
- if Warnings_Off (T)
+ if Has_Warnings_Off (T)
or else (Ekind (T) = E_Private_Type
- and then Warnings_Off (Full_View (T)))
+ and then Has_Warnings_Off (Full_View (T)))
then
goto Output;
end if;