lib-xref.adb (Output_References): Output progenitors of synchronized tagged types...

2014-01-23  Ed Schonberg  <schonberg@adacore.com>

	* lib-xref.adb (Output_References): Output progenitors of
	synchronized tagged types, for source navigation.

From-SVN: r206981

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 8c52ae99012966a9929302b4930dbc2775cd7bc5..a6d83c8054b99e3d503f22c62c278e44d94db0d5 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-23  Ed Schonberg  <schonberg@adacore.com>
+
+       * lib-xref.adb (Output_References): Output progenitors of
+       synchronized tagged types, for source navigation.
+
 2014-01-23  Robert Dewar  <dewar@adacore.com>
 
        * exp_util.adb, sinfo.adb, sinfo.ads, sem.adb, sem_res.adb,

diff --git a/gcc/ada/lib-xref.adb b/gcc/ada/lib-xref.adb
index 409e736aee0dc32fb1811dac03e7f4b6c041d248..dc93ec978add1d924d74c341e18f2e31295e960c 100644 (file)
--- a/gcc/ada/lib-xref.adb
+++ b/gcc/ada/lib-xref.adb
@@ -1309,22 +1309,6 @@ package body Lib.Xref is
                         Right := '>';
                      end if;
 
-                  --  For a synchronized type that implements an interface, we
-                  --  treat the first progenitor as the parent. This is only
-                  --  needed when compiling a package declaration on its own,
-                  --  if the body is present interfaces are handled properly.
-
-                  elsif Is_Concurrent_Type (Tref)
-                    and then Is_Tagged_Type (Tref)
-                    and then not Expander_Active
-                  then
-                     if Left /= '(' then
-                        Left := '<';
-                        Right := '>';
-                     end if;
-
-                     Tref := Entity (First (Interface_List (Parent (Tref))));
-
                   --  If the completion of a private type is itself a derived
                   --  type, we need the parent of the full view.
 
@@ -2430,25 +2414,42 @@ package body Lib.Xref is
 
                      Check_Type_Reference (XE.Key.Ent, False);
 
-                     --  Additional information for types with progenitors
+                     --  Additional information for types with progenitors,
+                     --  including synchronized tagged types.
 
-                     if Is_Record_Type (XE.Key.Ent)
-                       and then Present (Interfaces (XE.Key.Ent))
-                     then
-                        declare
-                           Elmt : Elmt_Id :=
-                                    First_Elmt (Interfaces (XE.Key.Ent));
-                        begin
-                           while Present (Elmt) loop
-                              Check_Type_Reference (Node (Elmt), True);
-                              Next_Elmt (Elmt);
-                           end loop;
-                        end;
+                     declare
+                        Typ      : constant Entity_Id := XE.Key.Ent;
+                        Elmt     : Elmt_Id;
+
+                     begin
+                        if Is_Record_Type (Typ)
+                          and then Present (Interfaces (Typ))
+                        then
+                           Elmt := First_Elmt (Interfaces (Typ));
+
+                        elsif Is_Concurrent_Type (Typ)
+                          and then Present (Corresponding_Record_Type (Typ))
+                          and then Present (
+                            Interfaces (Corresponding_Record_Type (Typ)))
+                        then
+                           Elmt :=
+                             First_Elmt (
+                              Interfaces (Corresponding_Record_Type (Typ)));
+
+                        else
+                           Elmt := No_Elmt;
+                        end if;
+
+                        while Present (Elmt) loop
+                           Check_Type_Reference (Node (Elmt), True);
+                           Next_Elmt (Elmt);
+                        end loop;
+                     end;
 
                      --  For array types, list index types as well. (This is
                      --  not C, indexes have distinct types).
 
-                     elsif Is_Array_Type (XE.Key.Ent) then
+                     if Is_Array_Type (XE.Key.Ent) then
                         declare
                            Indx : Node_Id;
                         begin