diff options
| author | Piotr Trojanek <trojanek@adacore.com> | 2022-08-23 15:59:32 +0200 |
|---|---|---|
| committer | Marc Poulhiès <poulhies@adacore.com> | 2022-11-04 14:47:30 +0100 |
| commit | 31392801794f057dab9df4b3f4cd7b516210c199 (patch) | |
| tree | 57cd4d9200b8468ddb67d46f0274aca8061a522f /gcc/ada/sem_warn.adb | |
| parent | 72baa4e2b7f8dfdb2c49950e12a397ef00d3bc16 (diff) | |
| download | gcc-31392801794f057dab9df4b3f4cd7b516210c199.zip gcc-31392801794f057dab9df4b3f4cd7b516210c199.tar.gz gcc-31392801794f057dab9df4b3f4cd7b516210c199.tar.bz2 | |
ada: Cleanup code for unreferenced variables
Further cleanups related to warnings about unreferenced objects.
gcc/ada/
* sem_warn.adb (Check_References): Remove useless query for "spec"
of a variable; refactor nested if-statements into a single
condition.
Diffstat (limited to 'gcc/ada/sem_warn.adb')
| -rw-r--r-- | gcc/ada/sem_warn.adb | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/gcc/ada/sem_warn.adb b/gcc/ada/sem_warn.adb index 423754f..a7f220b 100644 --- a/gcc/ada/sem_warn.adb +++ b/gcc/ada/sem_warn.adb @@ -1221,7 +1221,7 @@ package body Sem_Warn is elsif Warn_On_Constant and then Ekind (E1) = E_Variable and then Has_Initial_Value (E1) - and then Never_Set_In_Source_Check_Spec (E1) + and then Never_Set_In_Source (E1) and then not Generic_Package_Spec_Entity (E1) then -- A special case, if this variable is volatile and not @@ -1248,24 +1248,15 @@ package body Sem_Warn is -- Here we give the warning if referenced and no pragma -- Unreferenced or Unmodified is present. - else - -- Variable case - - if Ekind (E1) = E_Variable then - if Referenced_Check_Spec (E1) - and then not Has_Pragma_Unreferenced_Check_Spec (E1) - and then not Has_Pragma_Unmodified_Check_Spec (E1) - then - if not Warnings_Off_E1 - and then not Has_Junk_Name (E1) - then - Error_Msg_N -- CODEFIX - ("?k?& is not modified, " - & "could be declared constant!", - E1); - end if; - end if; - end if; + elsif Referenced (E1) + and then not Has_Unreferenced (E1) + and then not Has_Unmodified (E1) + and then not Warnings_Off_E1 + and then not Has_Junk_Name (E1) + then + Error_Msg_N -- CODEFIX + ("?k?& is not modified, could be declared constant!", + E1); end if; -- Other cases of a variable or parameter never set in source |