diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2015-02-05 12:10:42 +0100 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2015-02-05 12:10:42 +0100 |
| commit | 57979da1a8af9ae176809eee99390d6401ec389e (patch) | |
| tree | e6de1795907be9dfc82d63b1c74852406d971866 /gcc/ada/lib-xref.adb | |
| parent | 27d16306413f2e6f5eb3471db9593666c35694e3 (diff) | |
| download | gcc-57979da1a8af9ae176809eee99390d6401ec389e.zip gcc-57979da1a8af9ae176809eee99390d6401ec389e.tar.gz gcc-57979da1a8af9ae176809eee99390d6401ec389e.tar.bz2 | |
[multiple changes]
2015-02-05 Hristian Kirtchev <kirtchev@adacore.com>
* sem_prag.adb (Check_Pragma_Conformance): Add
local variable Arg. Ensure that all errors are associated with
the pragma if it appears without an argument. Add comments on
various cases.
2015-02-05 Robert Dewar <dewar@adacore.com>
* lib-xref.adb: Minor reformatting.
From-SVN: r220442
Diffstat (limited to 'gcc/ada/lib-xref.adb')
| -rw-r--r-- | gcc/ada/lib-xref.adb | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/gcc/ada/lib-xref.adb b/gcc/ada/lib-xref.adb index 11c2d06..2ebdb14 100644 --- a/gcc/ada/lib-xref.adb +++ b/gcc/ada/lib-xref.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1998-2014, Free Software Foundation, Inc. -- +-- Copyright (C) 1998-2015, Free Software Foundation, Inc. -- -- -- -- GNAT is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- @@ -415,6 +415,7 @@ package body Lib.Xref is function Get_Through_Renamings (E : Entity_Id) return Entity_Id is Result : Entity_Id := E; + begin while Present (Result) and then Is_Object (Result) @@ -422,6 +423,7 @@ package body Lib.Xref is loop Result := Get_Enclosing_Object (Renamed_Object (Result)); end loop; + return Result; end Get_Through_Renamings; @@ -646,11 +648,11 @@ package body Lib.Xref is -- initialized type. if not In_Extended_Main_Source_Unit (N) then - if Typ = 'e' - or else Typ = 'I' - or else Typ = 'p' - or else Typ = 'i' - or else Typ = 'k' + if Typ = 'e' or else + Typ = 'I' or else + Typ = 'p' or else + Typ = 'i' or else + Typ = 'k' or else (Typ = 'b' and then Is_Generic_Instance (E)) -- Allow the generation of references to reads, writes and calls |