[gcc(refs/users/aoliva/heads/testme)] enable control flow redundancy hardening unconditionally
Alexandre Oliva
aoliva@gcc.gnu.org
Fri Jun 9 06:17:28 GMT 2023
https://gcc.gnu.org/g:53ddfc84f35372e488988ee8231af2ddf54e2eeb
commit 53ddfc84f35372e488988ee8231af2ddf54e2eeb
Author: Alexandre Oliva <oliva@adacore.com>
Date: Thu Jun 8 01:35:37 2023 -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 cee34a74245..99c4a9085b1 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 044671cab79..faafaf7c8a0 100644
--- a/gcc/gimple-harden-control-flow.cc
+++ b/gcc/gimple-harden-control-flow.cc
@@ -91,6 +91,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",
@@ -104,6 +106,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",
@@ -115,6 +119,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 799ea41cedf..a2b6cefa0cc 100644
--- a/gcc/params.opt
+++ b/gcc/params.opt
@@ -183,7 +183,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=
More information about the Gcc-cvs
mailing list