diff options
| author | Piotr Trojanek <trojanek@adacore.com> | 2020-08-11 16:14:19 +0200 |
|---|---|---|
| committer | Pierre-Marie de Rodat <derodat@adacore.com> | 2020-10-22 08:11:19 -0400 |
| commit | 1c583927a57a06e9f94de4c982ae827d227543ab (patch) | |
| tree | 3978f118fb5b30cd2b7ccec56d2214f87c3fe2fb /gcc | |
| parent | f5d2432f9249f6150c6f723c70010e9aca25412e (diff) | |
| download | gcc-1c583927a57a06e9f94de4c982ae827d227543ab.zip gcc-1c583927a57a06e9f94de4c982ae827d227543ab.tar.gz gcc-1c583927a57a06e9f94de4c982ae827d227543ab.tar.bz2 | |
[Ada] Cleanup repeated code in checks for unused WITH clauses
gcc/ada/
* sem_warn.adb (Check_One_Unit): Avoid repeated calls by using a
local variable Lunit; remove local constant Eitem, which was
identical to Lunit.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/sem_warn.adb | 94 |
1 files changed, 43 insertions, 51 deletions
diff --git a/gcc/ada/sem_warn.adb b/gcc/ada/sem_warn.adb index 89e5696..aeea318 100644 --- a/gcc/ada/sem_warn.adb +++ b/gcc/ada/sem_warn.adb @@ -2507,7 +2507,7 @@ package body Sem_Warn is -- package with only a linker options pragma and nothing -- else or a pragma elaborate with a body library task). - elsif Has_Visible_Entities (Entity (Name (Item))) then + elsif Has_Visible_Entities (Lunit) then Error_Msg_N -- CODEFIX ("?u?unit& is not referenced!", Name (Item)); end if; @@ -2582,58 +2582,50 @@ package body Sem_Warn is -- Else the warning may be needed else - declare - Eitem : constant Entity_Id := - Entity (Name (Item)); - - begin - -- Warn if we unreferenced flag set and we - -- have not had serious errors. The reason we - -- inhibit the message if there are errors is - -- to prevent false positives from disabling - -- expansion. - - if not Has_Unreferenced (Eitem) - and then Serious_Errors_Detected = 0 + -- Warn if we unreferenced flag set and we have + -- not had serious errors. The reason we inhibit + -- the message if there are errors is to prevent + -- false positives from disabling expansion. + + if not Has_Unreferenced (Lunit) + and then Serious_Errors_Detected = 0 + then + -- Get possible package renaming + + Pack := Find_Package_Renaming (Munite, Lunit); + + -- No warning if either the package or its + -- renaming is used as a generic actual. + + if Used_As_Generic_Actual (Lunit) + or else + (Present (Pack) + and then + Used_As_Generic_Actual (Pack)) + then + exit; + end if; + + -- Here we give the warning + + Error_Msg_N -- CODEFIX + ("?u?no entities of & are referenced!", + Name (Item)); + + -- Flag renaming of package as well. If + -- the original package has warnings off, + -- we suppress the warning on the renaming + -- as well. + + if Present (Pack) + and then not Has_Warnings_Off (Lunit) + and then not Has_Unreferenced (Pack) then - -- Get possible package renaming - - Pack := - Find_Package_Renaming (Munite, Lunit); - - -- No warning if either the package or its - -- renaming is used as a generic actual. - - if Used_As_Generic_Actual (Eitem) - or else - (Present (Pack) - and then - Used_As_Generic_Actual (Pack)) - then - exit; - end if; - - -- Here we give the warning - - Error_Msg_N -- CODEFIX - ("?u?no entities of & are referenced!", - Name (Item)); - - -- Flag renaming of package as well. If - -- the original package has warnings off, - -- we suppress the warning on the renaming - -- as well. - - if Present (Pack) - and then not Has_Warnings_Off (Lunit) - and then not Has_Unreferenced (Pack) - then - Error_Msg_NE -- CODEFIX - ("?u?no entities of& are referenced!", - Unit_Declaration_Node (Pack), Pack); - end if; + Error_Msg_NE -- CODEFIX + ("?u?no entities of& are referenced!", + Unit_Declaration_Node (Pack), Pack); end if; - end; + end if; end if; exit; |