[gcc(refs/users/aoliva/heads/testme)] enable control flow redundancy hardening unconditionally

[Alexandre Oliva <aoliva@gcc.gnu.org>]

https://gcc.gnu.org/g:c281c090fe0289888265ae181499574394b5bc95

commit c281c090fe0289888265ae181499574394b5bc95
Author: Alexandre Oliva <oliva@adacore.com>
Date:   Wed Aug 24 13:36:58 2022 -0300

    enable control flow redundancy hardening unconditionally

Diff:
---
 gcc/common.opt                    | 2 +-
 gcc/gimple-harden-control-flow.cc | 6 ++++++
 gcc/params.opt                    | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/gcc/common.opt b/gcc/common.opt
index feea4920c9d..b2091642855 100644
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -1802,7 +1802,7 @@ Common Var(flag_harden_conditional_branches) Optimization
 Harden conditional branches by checking reversed conditions.
 
 fharden-control-flow-redundancy
-Common Var(flag_harden_control_flow_redundancy) Optimization
+Common Var(flag_harden_control_flow_redundancy) Init(-1) Optimization
 Harden control flow by recording and checking execution paths.
 
 fhardcfr-skip-leaf
diff --git a/gcc/gimple-harden-control-flow.cc b/gcc/gimple-harden-control-flow.cc
index 3998fd0d293..56ad6045b5e 100644
--- a/gcc/gimple-harden-control-flow.cc
+++ b/gcc/gimple-harden-control-flow.cc
@@ -90,6 +90,8 @@ public:
        call and restore it if it returns again.  */
     if (fun->calls_setjmp)
       {
+	if (flag_harden_control_flow_redundancy < 0)
+	  return false;
 	warning_at (DECL_SOURCE_LOCATION (fun->decl), 0,
 		    "%qD calls %<setjmp%> or similar,"
 		    " %<-fharden-control-flow-redundancy%> is not supported",
@@ -103,6 +105,8 @@ public:
        enough to make it worthwhile.  */
     if (fun->has_nonlocal_label)
       {
+	if (flag_harden_control_flow_redundancy < 0)
+	  return false;
 	warning_at (DECL_SOURCE_LOCATION (fun->decl), 0,
 		    "%qD receives nonlocal gotos,"
 		    " %<-fharden-control-flow-redundancy%> is not supported",
@@ -114,6 +118,8 @@ public:
 	&& (n_basic_blocks_for_fn (fun) - NUM_FIXED_BLOCKS
 	    > param_hardcfr_max_blocks))
       {
+	if (flag_harden_control_flow_redundancy < 0)
+	  return false;
 	warning_at (DECL_SOURCE_LOCATION (fun->decl), 0,
 		    "%qD has more than %u blocks, the requested"
 		    " maximum for %<-fharden-control-flow-redundancy%>",
diff --git a/gcc/params.opt b/gcc/params.opt
index bd0679bdcd3..2db693838dc 100644
--- a/gcc/params.opt
+++ b/gcc/params.opt
@@ -175,7 +175,7 @@ Common Joined UInteger Var(param_graphite_max_nb_scop_params) Init(10) Param Opt
 Maximum number of parameters in a SCoP.
 
 -param=hardcfr-max-blocks=
-Common Joined UInteger Var(param_hardcfr_max_blocks) Init(0) Param Optimization
+Common Joined UInteger Var(param_hardcfr_max_blocks) Init(32) Param Optimization
 Maximum number of blocks for -fharden-control-flow-redundancy.
 
 -param=hardcfr-max-inline-blocks=