From: Piotr Trojanek <troja...@adacore.com>
Code cleanup; behavior is unaffected. Flag Is_Inherited_Pragma is only set in
GNAT, but is not actually used, neither by the compiler nor by any backend.
gcc/ada/ChangeLog:
* contracts.adb (Inherit_Pragma): Don't set flag Is_Inherited_Pragma.
* gen_il-fields.ads (Opt_Field_Enum): Remove field identifier.
* gen_il-gen-gen_nodes.adb (N_Pragma): Remove field from node.
* sinfo.ads (Is_Inherited_Pragma): Remove field description.
(N_Pragma): Remove field reference.
Tested on x86_64-pc-linux-gnu, committed on master.
---
gcc/ada/contracts.adb | 8 ++------
gcc/ada/gen_il-fields.ads | 1 -
gcc/ada/gen_il-gen-gen_nodes.adb | 1 -
gcc/ada/sinfo.ads | 5 -----
4 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/gcc/ada/contracts.adb b/gcc/ada/contracts.adb
index 365c3e61130..4aed4dff27b 100644
--- a/gcc/ada/contracts.adb
+++ b/gcc/ada/contracts.adb
@@ -3593,8 +3593,7 @@ package body Contracts is
--------------------
procedure Inherit_Pragma (Prag_Id : Pragma_Id) is
- Prag : constant Node_Id := Get_Pragma (From_Subp, Prag_Id);
- New_Prag : Node_Id;
+ Prag : constant Node_Id := Get_Pragma (From_Subp, Prag_Id);
begin
-- A pragma cannot be part of more than one First_Pragma/Next_Pragma
@@ -3602,10 +3601,7 @@ package body Contracts is
-- flagged as inherited for distinction purposes.
if Present (Prag) then
- New_Prag := New_Copy_Tree (Prag);
- Set_Is_Inherited_Pragma (New_Prag);
-
- Add_Contract_Item (New_Prag, Subp);
+ Add_Contract_Item (New_Copy_Tree (Prag), Subp);
end if;
end Inherit_Pragma;
diff --git a/gcc/ada/gen_il-fields.ads b/gcc/ada/gen_il-fields.ads
index 70ece337e63..c778f00856d 100644
--- a/gcc/ada/gen_il-fields.ads
+++ b/gcc/ada/gen_il-fields.ads
@@ -266,7 +266,6 @@ package Gen_IL.Fields is
Is_Ignored_Ghost_Pragma,
Is_Implicit_With,
Is_In_Discriminant_Check,
- Is_Inherited_Pragma,
Is_Initialization_Block,
Is_Interpolated_String_Literal,
Is_Known_Guaranteed_ABE,
diff --git a/gcc/ada/gen_il-gen-gen_nodes.adb b/gcc/ada/gen_il-gen-gen_nodes.adb
index af5049bf33e..c3a97e6e16e 100644
--- a/gcc/ada/gen_il-gen-gen_nodes.adb
+++ b/gcc/ada/gen_il-gen-gen_nodes.adb
@@ -1439,7 +1439,6 @@ begin -- Gen_IL.Gen.Gen_Nodes
Sm (Is_Generic_Contract_Pragma, Flag),
Sm (Is_Ignored, Flag),
Sm (Is_Ignored_Ghost_Pragma, Flag),
- Sm (Is_Inherited_Pragma, Flag),
Sm (Next_Pragma, Node_Id),
Sm (Next_Rep_Item, Node_Id),
Sm (Uneval_Old_Accept, Flag),
diff --git a/gcc/ada/sinfo.ads b/gcc/ada/sinfo.ads
index 6abda7474bb..e9b2f0f3c5c 100644
--- a/gcc/ada/sinfo.ads
+++ b/gcc/ada/sinfo.ads
@@ -1763,10 +1763,6 @@ package Sinfo is
-- discriminant check has a correct value cannot be performed in this
-- case (or the discriminant check may be optimized away).
- -- Is_Inherited_Pragma
- -- This flag is set in an N_Pragma node that appears in a N_Contract node
- -- to indicate that the pragma has been inherited from a parent context.
-
-- Is_Initialization_Block
-- Defined in block nodes. Set when the block statement was created by
-- the finalization machinery to wrap initialization statements. This
@@ -2694,7 +2690,6 @@ package Sinfo is
-- Next_Rep_Item
-- Is_Generic_Contract_Pragma
-- Is_Checked_Ghost_Pragma
- -- Is_Inherited_Pragma
-- Is_Analyzed_Pragma
-- Class_Present set if from Aspect with 'Class
-- Uneval_Old_Accept
--
2.43.0
