aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Duff <duff@adacore.com>2021-03-04 16:27:05 -0500
committerPierre-Marie de Rodat <derodat@adacore.com>2021-06-17 10:32:09 -0400
commit8863c3aa86c4dffd1869c04c7df7b5065751235d (patch)
tree7e59a8cd9a85fec6b102f7fdf782451cc6507186
parent9e1ca4e3ab0fb7156fed4480c8f35810d00ff84d (diff)
downloadgcc-8863c3aa86c4dffd1869c04c7df7b5065751235d.zip
gcc-8863c3aa86c4dffd1869c04c7df7b5065751235d.tar.gz
gcc-8863c3aa86c4dffd1869c04c7df7b5065751235d.tar.bz2
[Ada] Display Entity in debugging printouts
gcc/ada/ * treepr.adb (Print_Node): Display the Entity or Associated_Node fields if appropriate. * sinfo-utils.ads (F_Associated_Node, F_Entity): Remove. These are no longer needed.
-rw-r--r--gcc/ada/sinfo-utils.ads6
-rw-r--r--gcc/ada/treepr.adb16
2 files changed, 12 insertions, 10 deletions
diff --git a/gcc/ada/sinfo-utils.ads b/gcc/ada/sinfo-utils.ads
index dce6592..ab8e528 100644
--- a/gcc/ada/sinfo-utils.ads
+++ b/gcc/ada/sinfo-utils.ads
@@ -139,12 +139,6 @@ package Sinfo.Utils is
(N : N_Inclusive_Has_Entity; Val : Node_Id)
renames Set_Entity_Or_Associated_Node;
- function F_Associated_Node return Node_Field renames
- F_Entity_Or_Associated_Node;
- function F_Entity return Node_Field renames
- F_Entity_Or_Associated_Node;
- -- Note that we are renaming the enumeration literals here
-
---------------
-- Debugging --
---------------
diff --git a/gcc/ada/treepr.adb b/gcc/ada/treepr.adb
index 50d4ca3..d869ea7 100644
--- a/gcc/ada/treepr.adb
+++ b/gcc/ada/treepr.adb
@@ -1272,14 +1272,22 @@ package body Treepr is
Print_Eol;
end if;
- -- Print Entity field if operator (other cases of Entity
- -- are in the table, so are handled in the normal circuit)
+ -- Deal with Entity_Or_Associated_Node. If N has both, then just
+ -- print Entity; they are the same thing.
- if Nkind (N) in N_Op and then Present (Entity (N)) then
+ if N in N_Inclusive_Has_Entity and then Present (Entity (N)) then
Print_Str (Prefix);
Print_Str ("Entity = ");
Print_Node_Ref (Entity (N));
Print_Eol;
+
+ elsif N in N_Has_Associated_Node
+ and then Present (Associated_Node (N))
+ then
+ Print_Str (Prefix);
+ Print_Str ("Associated_Node = ");
+ Print_Node_Ref (Associated_Node (N));
+ Print_Eol;
end if;
-- Print special fields if we have a subexpression
@@ -1391,7 +1399,7 @@ package body Treepr is
| F_Sloc
| F_Left_Opnd
| F_Right_Opnd
- | F_Entity
+ | F_Entity_Or_Associated_Node -- one of them was printed
| F_Assignment_OK
| F_Do_Range_Check
| F_Has_Dynamic_Length_Check