From: Etienne Servais <servais@adacore.com>
Date: Mon, 17 Jan 2022 15:26:00 +0000 (+0100)
Subject: [Ada] Fully qualify name in JSON representation info
X-Git-Tag: basepoints/gcc-14~7009
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ebbe48015e6070b0f020fa57c7eb7fce554e71d4;p=thirdparty%2Fgcc.git

[Ada] Fully qualify name in JSON representation info

The current termination condition of the recursion is wrong.  When in
JSON mode, names should be fully qualified. This requires to stop not at
the first encountered compilation unit but to recurse up to Standard.

gcc/ada/

	* repinfo.adb (List_Name): Rework termination condition.
---

diff --git a/gcc/ada/repinfo.adb b/gcc/ada/repinfo.adb
index b77ff4aba5d..ed7312c0f94 100644
--- a/gcc/ada/repinfo.adb
+++ b/gcc/ada/repinfo.adb
@@ -44,6 +44,7 @@ with Sinfo.Nodes;    use Sinfo.Nodes;
 with Sinfo.Utils;    use Sinfo.Utils;
 with Sinput;         use Sinput;
 with Snames;         use Snames;
+with Stand;          use Stand;
 with Stringt;        use Stringt;
 with Table;
 with Ttypes;
@@ -874,10 +875,11 @@ package body Repinfo is
       C : Character;
 
    begin
-      --  List the qualified name recursively, except
-      --  at compilation unit level in default mode.
+      --  In JSON mode, we recurse up to Standard. This is also valid in
+      --  default mode where we recurse up to the first compilation unit and
+      --  should not get to Standard.
 
-      if Is_Compilation_Unit (Ent) then
+      if Scope (Ent) = Standard_Standard then
          null;
       elsif not Is_Compilation_Unit (Scope (Ent))
         or else List_Representation_Info_To_JSON