From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2140) id A8DB03858C20; Thu, 8 Jun 2023 10:43:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A8DB03858C20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1686221013; bh=k1Lj5DwflnXli9AL2oJuDJkte0H3xP7EtURyyecgr10=; h=From:To:Subject:Date:From; b=iVwPqt1BmqsYzeO8Cxmry2wY33SarRaVKpQBJMqy90wump21y9NQ9oq7SzYvhGxJc fu1oUayoi/M4rJV6Pj/hTRINajP3vcp73IeR7eESUocn3WJr2lR08bMZJzs4RFv8jK wSdx1ddpkIvL+OXsvyVqhh8bpt24A6EoINMt8WK8= 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/testme)] enable control flow redundancy hardening unconditionally X-Act-Checkin: gcc X-Git-Author: Alexandre Oliva X-Git-Refname: refs/users/aoliva/heads/testme X-Git-Oldrev: 7d38268b50c21a5c393057d7fc7e9bea8b1b8374 X-Git-Newrev: da0eacb29b4aeb8cfac721b2e771ef29d6a64e6b Message-Id: <20230608104333.A8DB03858C20@sourceware.org> Date: Thu, 8 Jun 2023 10:43:33 +0000 (GMT) List-Id: https://gcc.gnu.org/g:da0eacb29b4aeb8cfac721b2e771ef29d6a64e6b commit da0eacb29b4aeb8cfac721b2e771ef29d6a64e6b Author: Alexandre Oliva 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 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 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 % 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 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=