aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Baird <baird@adacore.com>2022-04-15 13:30:34 -0700
committerPierre-Marie de Rodat <derodat@adacore.com>2022-05-30 08:29:01 +0000
commit55c19dda8c6c5fd40f1ec7ea4dd2f0c12d8c309f (patch)
tree9f6e028ab3dcb2dede90149e5cc2249afaa4f10c
parentefaee961d935f8f4fb640d8445603fe52a9e247c (diff)
downloadgcc-55c19dda8c6c5fd40f1ec7ea4dd2f0c12d8c309f.zip
gcc-55c19dda8c6c5fd40f1ec7ea4dd2f0c12d8c309f.tar.gz
gcc-55c19dda8c6c5fd40f1ec7ea4dd2f0c12d8c309f.tar.bz2
[Ada] Delete no-longer-used Convert_To_Return_False flag
As a result of other recent changes, the Convert_To_Return_False flag is never set. The flag can be therefore be deleted. gcc/ada/ * exp_ch11.adb (Expand_N_Raise_Expression): Remove Convert_To_Return_False test. * gen_il-fields.ads: Remove Convert_To_Return_False field. * gen_il-gen-gen_nodes.adb: Remove use of Convert_To_Return_False field. * sinfo.ads: Remove comment describing Convert_To_Return_False flag.
-rw-r--r--gcc/ada/exp_ch11.adb32
-rw-r--r--gcc/ada/gen_il-fields.ads1
-rw-r--r--gcc/ada/gen_il-gen-gen_nodes.adb3
-rw-r--r--gcc/ada/sinfo.ads7
4 files changed, 8 insertions, 35 deletions
diff --git a/gcc/ada/exp_ch11.adb b/gcc/ada/exp_ch11.adb
index c61f154..c60fe346 100644
--- a/gcc/ada/exp_ch11.adb
+++ b/gcc/ada/exp_ch11.adb
@@ -1350,37 +1350,19 @@ package body Exp_Ch11 is
-- in
-- raise Constraint_Error;
- -- unless the flag Convert_To_Return_False is set, in which case
- -- the transformation is to:
-
- -- do
- -- return False;
- -- in
- -- raise Constraint_Error;
-
-- The raise constraint error can never be executed. It is just a dummy
-- node that can be labeled with an arbitrary type.
RCE := Make_Raise_Constraint_Error (Loc, Reason => CE_Explicit_Raise);
Set_Etype (RCE, Typ);
- if Convert_To_Return_False (N) then
- Rewrite (N,
- Make_Expression_With_Actions (Loc,
- Actions => New_List (
- Make_Simple_Return_Statement (Loc,
- Expression => New_Occurrence_Of (Standard_False, Loc))),
- Expression => RCE));
-
- else
- Rewrite (N,
- Make_Expression_With_Actions (Loc,
- Actions => New_List (
- Make_Raise_Statement (Loc,
- Name => Name (N),
- Expression => Expression (N))),
- Expression => RCE));
- end if;
+ Rewrite (N,
+ Make_Expression_With_Actions (Loc,
+ Actions => New_List (
+ Make_Raise_Statement (Loc,
+ Name => Name (N),
+ Expression => Expression (N))),
+ Expression => RCE));
Analyze_And_Resolve (N, Typ);
end Expand_N_Raise_Expression;
diff --git a/gcc/ada/gen_il-fields.ads b/gcc/ada/gen_il-fields.ads
index 878755b..e188a6d 100644
--- a/gcc/ada/gen_il-fields.ads
+++ b/gcc/ada/gen_il-fields.ads
@@ -118,7 +118,6 @@ package Gen_IL.Fields is
Contract_Test_Cases,
Controlling_Argument,
Conversion_OK,
- Convert_To_Return_False,
Corresponding_Aspect,
Corresponding_Body,
Corresponding_Entry_Body,
diff --git a/gcc/ada/gen_il-gen-gen_nodes.adb b/gcc/ada/gen_il-gen-gen_nodes.adb
index 96e1c76..dd730f4 100644
--- a/gcc/ada/gen_il-gen-gen_nodes.adb
+++ b/gcc/ada/gen_il-gen-gen_nodes.adb
@@ -523,8 +523,7 @@ begin -- Gen_IL.Gen.Gen_Nodes
Cc (N_Raise_Expression, N_Subexpr,
(Sy (Name, Node_Id, Default_Empty),
- Sy (Expression, Node_Id, Default_Empty),
- Sm (Convert_To_Return_False, Flag)));
+ Sy (Expression, Node_Id, Default_Empty)));
Cc (N_Range, N_Subexpr,
(Sy (Low_Bound, Node_Id),
diff --git a/gcc/ada/sinfo.ads b/gcc/ada/sinfo.ads
index e3e06ee..da42ae5 100644
--- a/gcc/ada/sinfo.ads
+++ b/gcc/ada/sinfo.ads
@@ -1005,12 +1005,6 @@ package Sinfo is
-- direct conversion of the underlying integer result, with no regard to
-- the small operand.
- -- Convert_To_Return_False
- -- Present in N_Raise_Expression nodes that appear in the body of the
- -- special predicateM function used to test a predicate in the context
- -- of a membership test, where raise expression results in returning a
- -- value of False rather than raising an exception.
-
-- Corresponding_Aspect
-- Present in N_Pragma node. Used to point back to the source aspect from
-- the corresponding pragma. This field is Empty for source pragmas.
@@ -6932,7 +6926,6 @@ package Sinfo is
-- Sloc points to RAISE
-- Name (always present)
-- Expression (set to Empty if no expression present)
- -- Convert_To_Return_False
-- plus fields for expression
-------------------------------