aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorRichard Biener <rguenther@suse.de>2015-12-10 09:10:40 +0000
committerRichard Biener <rguenth@gcc.gnu.org>2015-12-10 09:10:40 +0000
commit2c3903c73b5b8a07a8c2cc18e4c44e730d9cff39 (patch)
tree084e3fe7acf206e115246dc43b58b171d6850eda /gcc
parentd4f4e71c84fc7bcf21f45e315a07b1408f514f75 (diff)
downloadgcc-2c3903c73b5b8a07a8c2cc18e4c44e730d9cff39.zip
gcc-2c3903c73b5b8a07a8c2cc18e4c44e730d9cff39.tar.gz
gcc-2c3903c73b5b8a07a8c2cc18e4c44e730d9cff39.tar.bz2
tree-if-conv.c: Include params.h.
2015-12-10 Richard Biener <rguenther@suse.de> * 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. From-SVN: r231495
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/tree-if-conv.c5
2 files changed, 10 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b5ee0be..6f9fc2b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,12 @@
2015-12-10 Richard Biener <rguenther@suse.de>
+ * 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 <rguenther@suse.de>
+
PR ipa/68721
* ipa-split.c (split_function): Record return value properly
when the split part doesn't set it.
diff --git a/gcc/tree-if-conv.c b/gcc/tree-if-conv.c
index 63da90a..635a552 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<data_reference_p> 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<data_reference_p> 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;