From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2140) id 55954385AC31; Fri, 21 Jan 2022 20:25:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 55954385AC31 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Alexandre Oliva To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/users/aoliva/heads/hardcfr)] enable control flow redundancy hardening unconditionally X-Act-Checkin: gcc X-Git-Author: Alexandre Oliva X-Git-Refname: refs/users/aoliva/heads/hardcfr X-Git-Oldrev: d7ea6c2dcc1f019eec30dec246d64da90a30bda4 X-Git-Newrev: 5c07f1f408ec72a437ededc2ee8fe054a7745e5e Message-Id: <20220121202540.55954385AC31@sourceware.org> Date: Fri, 21 Jan 2022 20:25:40 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Jan 2022 20:25:40 -0000 https://gcc.gnu.org/g:5c07f1f408ec72a437ededc2ee8fe054a7745e5e commit 5c07f1f408ec72a437ededc2ee8fe054a7745e5e Author: Alexandre Oliva Date: Wed Jan 19 05:51:13 2022 -0300 enable control flow redundancy hardening unconditionally Diff: --- gcc/common.opt | 2 +- gcc/gimple-harden-control-flow.cc | 4 ++++ gcc/params.opt | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gcc/common.opt b/gcc/common.opt index 1ebcf307963..474085595bb 100644 --- a/gcc/common.opt +++ b/gcc/common.opt @@ -1771,7 +1771,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. ; Nonzero means ignore `#ident' directives. 0 means handle them. diff --git a/gcc/gimple-harden-control-flow.cc b/gcc/gimple-harden-control-flow.cc index 65b0b701744..2d62e8e2f76 100644 --- a/gcc/gimple-harden-control-flow.cc +++ b/gcc/gimple-harden-control-flow.cc @@ -84,6 +84,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 % or similar," " %<-fharden-control-flow-redundancy%> is not supported", @@ -93,6 +95,8 @@ public: if (n_basic_blocks_for_fn (fun) - 2 > 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 147ecdb684c..de834ac20b7 100644 --- a/gcc/params.opt +++ b/gcc/params.opt @@ -202,7 +202,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(-1) 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=