public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r12-3797] [Ada] Generate temporary for if-expression with -fpreserve-control-flow
@ 2021-09-22 15:10 Pierre-Marie de Rodat
0 siblings, 0 replies; only message in thread
From: Pierre-Marie de Rodat @ 2021-09-22 15:10 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:26ece6eca7c02675fcae29a1fa5285b740241d60
commit r12-3797-g26ece6eca7c02675fcae29a1fa5285b740241d60
Author: Eric Botcazou <ebotcazou@adacore.com>
Date: Thu Jul 15 11:18:02 2021 +0200
[Ada] Generate temporary for if-expression with -fpreserve-control-flow
gcc/ada/
* exp_ch4.adb (Expand_N_If_Expression): Generate an intermediate
temporary when the expression is a condition in an outer decision
and control-flow optimizations are suppressed.
Diff:
---
gcc/ada/exp_ch4.adb | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/gcc/ada/exp_ch4.adb b/gcc/ada/exp_ch4.adb
index 497a52ba05d..d7037bf37f2 100644
--- a/gcc/ada/exp_ch4.adb
+++ b/gcc/ada/exp_ch4.adb
@@ -6253,6 +6253,46 @@ package body Exp_Ch4 is
return;
end if;
+ -- For the sake of GNATcoverage, generate an intermediate temporary in
+ -- the case where the if-expression is a condition in an outer decision,
+ -- in order to make sure that no branch is shared between the decisions.
+
+ elsif Opt.Suppress_Control_Flow_Optimizations
+ and then Nkind (Original_Node (Parent (N))) in N_Case_Expression
+ | N_Case_Statement
+ | N_If_Expression
+ | N_If_Statement
+ | N_Goto_When_Statement
+ | N_Loop_Statement
+ | N_Return_When_Statement
+ | N_Short_Circuit
+ then
+ declare
+ Cnn : constant Entity_Id := Make_Temporary (Loc, 'C');
+ Acts : List_Id;
+
+ begin
+ -- Generate:
+ -- do
+ -- Cnn : constant Typ := N;
+ -- in Cnn end
+
+ Acts := New_List (
+ Make_Object_Declaration (Loc,
+ Defining_Identifier => Cnn,
+ Constant_Present => True,
+ Object_Definition => New_Occurrence_Of (Typ, Loc),
+ Expression => Relocate_Node (N)));
+
+ Rewrite (N,
+ Make_Expression_With_Actions (Loc,
+ Expression => New_Occurrence_Of (Cnn, Loc),
+ Actions => Acts));
+
+ Analyze_And_Resolve (N, Typ);
+ return;
+ end;
+
-- If no actions then no expansion needed, gigi will handle it using the
-- same approach as a C conditional expression.
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-09-22 15:10 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-22 15:10 [gcc r12-3797] [Ada] Generate temporary for if-expression with -fpreserve-control-flow Pierre-Marie de Rodat
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).