diff options
Diffstat (limited to 'gcc/ada/lib-xref.adb')
| -rw-r--r-- | gcc/ada/lib-xref.adb | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/gcc/ada/lib-xref.adb b/gcc/ada/lib-xref.adb index d64b4b2..c3039cd 100644 --- a/gcc/ada/lib-xref.adb +++ b/gcc/ada/lib-xref.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1998-2015, Free Software Foundation, Inc. -- +-- Copyright (C) 1998-2016, 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- -- @@ -1467,17 +1467,23 @@ package body Lib.Xref is -- initialized with a tag-indeterminate call gets a subtype -- of the classwide type during expansion. See if the original -- type in the declaration is named, and return it instead - -- of going to the root type. + -- of going to the root type. The expression may be a class- + -- wide function call whose result is on the secondary stack, + -- which forces the declaration to be rewritten as a renaming, + -- so examine the source declaration. - if Ekind (Tref) = E_Class_Wide_Subtype - and then Nkind (Parent (Ent)) = N_Object_Declaration - and then - Nkind (Original_Node (Object_Definition (Parent (Ent)))) - = N_Identifier - then - Tref := - Entity - (Original_Node ((Object_Definition (Parent (Ent))))); + if Ekind (Tref) = E_Class_Wide_Subtype then + declare + Decl : constant Node_Id := Original_Node (Parent (Ent)); + begin + if Nkind (Decl) = N_Object_Declaration + and then Is_Entity_Name + (Original_Node ((Object_Definition (Decl)))) + then + Tref := + Entity ((Original_Node ((Object_Definition (Decl))))); + end if; + end; end if; -- For anything else, exit |