This patch removes the debug flags -gnatd.X and -gnatd.Y along with
the related Opt flag Use_Expression_With_Actions. This flag was for
temporary use as this feature was implemented. It is now fully
implemented, and we have no use for the flag, or for the special
code used in a few cases if the flag was False. No functional
effect, so no test needed.
Tested on x86_64-pc-linux-gnu, committed on trunk
2013-04-25 Robert Dewar <de...@adacore.com>
* debug.adb: Remove d.X and d.Y entries and documentation.
* exp_ch4.adb (Expand_N_If_Expression): Remove special code used
if expression with actions not available (now always available).
(Expand_Short_Circuit_Operator): Same change.
* gnat1drv.adb (Adjust_Global_Switches) Remove setting
Use_Expression_With_Actions flag, since this is now obsolete.
* opt.ads (Use_Expression_Actions): Removed (always True now).
* sinfo.ads: Minor comment updates.
Index: sinfo.ads
===================================================================
--- sinfo.ads (revision 198275)
+++ sinfo.ads (working copy)
@@ -7121,8 +7121,8 @@
-- Expression (Node3)
-- plus fields for expression
- -- Note: the actions list is always non-null, since we would
- -- never have created this node if there weren't some actions.
+ -- Note: the actions list is always non-null, since we would never have
+ -- created this node if there weren't some actions.
-- Note: Expression may be a Null_Statement, in which case the
-- N_Expression_With_Actions has type Standard_Void_Type. However some
Index: debug.adb
===================================================================
--- debug.adb (revision 198234)
+++ debug.adb (working copy)
@@ -141,8 +141,8 @@
-- d.U Ignore indirect calls for static elaboration
-- d.V Extensions for formal verification
-- d.W Print out debugging information for Walk_Library_Items
- -- d.X Use Expression_With_Actions
- -- d.Y Do not use Expression_With_Actions
+ -- d.X
+ -- d.Y
-- d.Z Dump flow analysis graphs, for debugging purposes (gnat2why)
-- d1 Error msgs have node numbers where possible
@@ -675,14 +675,6 @@
-- the order in which units are walked. This is primarily for use in
-- debugging CodePeer mode.
- -- d.X By default, the compiler uses an elaborate rewriting framework for
- -- short-circuited forms where the right hand condition generates
- -- actions to be inserted. With the gcc backend, we now use the new
- -- N_Expression_With_Actions node for this expansion, but we still use
- -- the old method for other backends and in SCIL mode. This debug flag
- -- forces use of the new N_Expression_With_Actions node in these other
- -- cases and is intended for transitional use.
-
-- d.Z In gnat2why, in Flow analysis mode (-gnatd.Q), dump the different
-- graphs (control flow, control dependence) for debugging purposes.
-- This debug flag will be removed when flow analysis is sufficiently
Index: gnat1drv.adb
===================================================================
--- gnat1drv.adb (revision 198243)
+++ gnat1drv.adb (working copy)
@@ -536,24 +536,6 @@
Suppress_Options.Suppress (Atomic_Synchronization) :=
not Atomic_Sync_Default_On_Target;
- -- Set switch indicating if we can use N_Expression_With_Actions
-
- -- Debug flag -gnatd.X decisively sets usage on
-
- if Debug_Flag_Dot_XX then
- Use_Expression_With_Actions := True;
-
- -- Debug flag -gnatd.Y decisively sets usage off
-
- elsif Debug_Flag_Dot_YY then
- Use_Expression_With_Actions := False;
-
- -- Otherwise this feature is implemented, so we allow its use
-
- else
- Use_Expression_With_Actions := True;
- end if;
-
-- Set switch indicating if back end can handle limited types, and
-- guarantee that no incorrect copies are made (e.g. in the context
-- of an if or case expression).
Index: exp_ch4.adb
===================================================================
--- exp_ch4.adb (revision 198243)
+++ exp_ch4.adb (working copy)
@@ -5469,20 +5469,11 @@
Remove (Expr);
if Present (Actions) then
-
- -- If we are not allowed to use Expression_With_Actions, just skip
- -- the optimization, it is not critical for correctness.
-
- if not Use_Expression_With_Actions then
- goto Skip_Optimization;
- end if;
-
Rewrite (N,
Make_Expression_With_Actions (Loc,
Expression => Relocate_Node (Expr),
Actions => Actions));
Analyze_And_Resolve (N, Typ);
-
else
Rewrite (N, Relocate_Node (Expr));
end if;
@@ -5494,8 +5485,6 @@
return;
end if;
- <<Skip_Optimization>>
-
-- If the type is limited or unconstrained, we expand as follows to
-- avoid any possibility of improper copies.
@@ -5590,73 +5579,28 @@
elsif Present (Then_Actions (N)) or else Present (Else_Actions (N)) then
- -- We have two approaches to handling this. If we are allowed to use
- -- N_Expression_With_Actions, then we can just wrap the actions into
- -- the appropriate expression.
+ -- We now wrap the actions into the appropriate expression
- if Use_Expression_With_Actions then
- if Present (Then_Actions (N)) then
- Rewrite (Thenx,
- Make_Expression_With_Actions (Sloc (Thenx),
- Actions => Then_Actions (N),
- Expression => Relocate_Node (Thenx)));
- Set_Then_Actions (N, No_List);
- Analyze_And_Resolve (Thenx, Typ);
- end if;
+ if Present (Then_Actions (N)) then
+ Rewrite (Thenx,
+ Make_Expression_With_Actions (Sloc (Thenx),
+ Actions => Then_Actions (N),
+ Expression => Relocate_Node (Thenx)));
+ Set_Then_Actions (N, No_List);
+ Analyze_And_Resolve (Thenx, Typ);
+ end if;
- if Present (Else_Actions (N)) then
- Rewrite (Elsex,
- Make_Expression_With_Actions (Sloc (Elsex),
- Actions => Else_Actions (N),
- Expression => Relocate_Node (Elsex)));
- Set_Else_Actions (N, No_List);
- Analyze_And_Resolve (Elsex, Typ);
- end if;
-
- return;
-
- -- if we can't use N_Expression_With_Actions nodes, then we insert
- -- the following sequence of actions (using Insert_Actions):
-
- -- Cnn : typ;
- -- if cond then
- -- <<then actions>>
- -- Cnn := then-expr;
- -- else
- -- <<else actions>>
- -- Cnn := else-expr
- -- end if;
-
- -- and replace the if expression by a reference to Cnn
-
- else
- Cnn := Make_Temporary (Loc, 'C', N);
-
- Decl :=
- Make_Object_Declaration (Loc,
- Defining_Identifier => Cnn,
- Object_Definition => New_Occurrence_Of (Typ, Loc));
-
- New_If :=
- Make_Implicit_If_Statement (N,
- Condition => Relocate_Node (Cond),
-
- Then_Statements => New_List (
- Make_Assignment_Statement (Sloc (Thenx),
- Name => New_Occurrence_Of (Cnn, Sloc (Thenx)),
- Expression => Relocate_Node (Thenx))),
-
- Else_Statements => New_List (
- Make_Assignment_Statement (Sloc (Elsex),
- Name => New_Occurrence_Of (Cnn, Sloc (Elsex)),
- Expression => Relocate_Node (Elsex))));
-
- Set_Assignment_OK (Name (First (Then_Statements (New_If))));
- Set_Assignment_OK (Name (First (Else_Statements (New_If))));
-
- New_N := New_Occurrence_Of (Cnn, Loc);
+ if Present (Else_Actions (N)) then
+ Rewrite (Elsex,
+ Make_Expression_With_Actions (Sloc (Elsex),
+ Actions => Else_Actions (N),
+ Expression => Relocate_Node (Elsex)));
+ Set_Else_Actions (N, No_List);
+ Analyze_And_Resolve (Elsex, Typ);
end if;
+ return;
+
-- If no actions then no expansion needed, gigi will handle it using
-- the same approach as a C conditional expression.
@@ -11098,29 +11042,6 @@
Shortcut_Ent : constant Entity_Id := Boolean_Literals (Shortcut_Value);
-- If Left = Shortcut_Value then Right need not be evaluated
- function Make_Test_Expr (Opnd : Node_Id) return Node_Id;
- -- For Opnd a boolean expression, return a Boolean expression equivalent
- -- to Opnd /= Shortcut_Value.
-
- --------------------
- -- Make_Test_Expr --
- --------------------
-
- function Make_Test_Expr (Opnd : Node_Id) return Node_Id is
- begin
- if Shortcut_Value then
- return Make_Op_Not (Sloc (Opnd), Opnd);
- else
- return Opnd;
- end if;
- end Make_Test_Expr;
-
- Op_Var : Entity_Id;
- -- Entity for a temporary variable holding the value of the operator,
- -- used for expansion in the case where actions are present.
-
- -- Start of processing for Expand_Short_Circuit_Operator
-
begin
-- Deal with non-standard booleans
@@ -11172,78 +11093,20 @@
-- must only be executed if the right operand of the short circuit is
-- executed and not otherwise.
- -- the temporary variable C.
-
if Present (Actions (N)) then
Actlist := Actions (N);
- -- The old approach is to expand:
+ -- We now use an Expression_With_Actions node for the right operand
+ -- of the short-circuit form. Note that this solves the traceability
+ -- problems for coverage analysis.
- -- left AND THEN right
+ Rewrite (Right,
+ Make_Expression_With_Actions (LocR,
+ Expression => Relocate_Node (Right),
+ Actions => Actlist));
+ Set_Actions (N, No_List);
+ Analyze_And_Resolve (Right, Standard_Boolean);
- -- into
-
- -- C : Boolean := False;
- -- IF left THEN
- -- Actions;
- -- IF right THEN
- -- C := True;
- -- END IF;
- -- END IF;
-
- -- and finally rewrite the operator into a reference to C. Similarly
- -- for left OR ELSE right, with negated values. Note that this
- -- rewrite causes some difficulties for coverage analysis because
- -- of the introduction of the new variable C, which obscures the
- -- structure of the test.
-
- -- We use this "old approach" if use of N_Expression_With_Actions
- -- is False (see description in Opt of when this is or is not set).
-
- if not Use_Expression_With_Actions then
- Op_Var := Make_Temporary (Loc, 'C', Related_Node => N);
-
- Insert_Action (N,
- Make_Object_Declaration (Loc,
- Defining_Identifier =>
- Op_Var,
- Object_Definition =>
- New_Occurrence_Of (Standard_Boolean, Loc),
- Expression =>
- New_Occurrence_Of (Shortcut_Ent, Loc)));
-
- Append_To (Actlist,
- Make_Implicit_If_Statement (Right,
- Condition => Make_Test_Expr (Right),
- Then_Statements => New_List (
- Make_Assignment_Statement (LocR,
- Name => New_Occurrence_Of (Op_Var, LocR),
- Expression =>
- New_Occurrence_Of
- (Boolean_Literals (not Shortcut_Value), LocR)))));
-
- Insert_Action (N,
- Make_Implicit_If_Statement (Left,
- Condition => Make_Test_Expr (Left),
- Then_Statements => Actlist));
-
- Rewrite (N, New_Occurrence_Of (Op_Var, Loc));
- Analyze_And_Resolve (N, Standard_Boolean);
-
- -- The new approach, activated for now by the use of debug flag
- -- -gnatd.X is to use the new Expression_With_Actions node for the
- -- right operand of the short-circuit form. This should solve the
- -- traceability problems for coverage analysis.
-
- else
- Rewrite (Right,
- Make_Expression_With_Actions (LocR,
- Expression => Relocate_Node (Right),
- Actions => Actlist));
- Set_Actions (N, No_List);
- Analyze_And_Resolve (Right, Standard_Boolean);
- end if;
-
Adjust_Result_Type (N, Typ);
return;
end if;
Index: opt.ads
===================================================================
--- opt.ads (revision 198234)
+++ opt.ads (working copy)
@@ -1460,13 +1460,6 @@
-- Set to True if -h (-gnath for the compiler) switch encountered
-- requesting usage information
- Use_Expression_With_Actions : Boolean;
- -- The N_Expression_With_Actions node has been introduced relatively
- -- recently, and not all back ends are prepared to handle it yet. So
- -- we use this flag to suppress its use during a transitional period.
- -- Currently the default is False for all cases (set in gnat1drv).
- -- The default can be modified using -gnatd.X/-gnatd.Y.
-
Use_Pragma_Linker_Constructor : Boolean := False;
-- GNATBIND
-- True if pragma Linker_Constructor applies to adainit
