From: rguenth Date: Thu, 10 Dec 2015 09:10:40 +0000 (+0000) Subject: 2015-12-10 Richard Biener X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d2276060262776da2fec04db18b81fde9460b622;p=thirdparty%2Fgcc.git 2015-12-10 Richard Biener * tree-if-conv.c: Include params.h. (ifcvt_memrefs_wont_trap): Use PARAM_ALLOW_STORE_DATA_RACES instead of flag_tree_loop_if_convert_stores to guard cases we'd introduce store-data-races. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@231495 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b5ee0be9a537..6f9fc2bd2320 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2015-12-10 Richard Biener + + * tree-if-conv.c: Include params.h. + (ifcvt_memrefs_wont_trap): Use PARAM_ALLOW_STORE_DATA_RACES + instead of flag_tree_loop_if_convert_stores to guard cases + we'd introduce store-data-races. + 2015-12-10 Richard Biener PR ipa/68721 diff --git a/gcc/tree-if-conv.c b/gcc/tree-if-conv.c index 63da90a4d3fa..635a55204c39 100644 --- a/gcc/tree-if-conv.c +++ b/gcc/tree-if-conv.c @@ -112,6 +112,7 @@ along with GCC; see the file COPYING3. If not see #include "tree-hash-traits.h" #include "varasm.h" #include "builtins.h" +#include "params.h" /* List of basic blocks in if-conversion-suitable order. */ static basic_block *ifc_bbs; @@ -714,7 +715,7 @@ ifcvt_memrefs_wont_trap (gimple *stmt, vec drs) to unconditionally. */ if (base_master_dr && DR_BASE_W_UNCONDITIONALLY (*base_master_dr)) - return flag_tree_loop_if_convert_stores; + return PARAM_VALUE (PARAM_ALLOW_STORE_DATA_RACES); else { /* or the base is know to be not readonly. */ @@ -722,7 +723,7 @@ ifcvt_memrefs_wont_trap (gimple *stmt, vec drs) if (DECL_P (base_tree) && decl_binds_to_current_def_p (base_tree) && ! TREE_READONLY (base_tree)) - return flag_tree_loop_if_convert_stores; + return PARAM_VALUE (PARAM_ALLOW_STORE_DATA_RACES); } } return false;