aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorRichard Sandiford <rsandifo@linux.vnet.ibm.com>2014-05-07 18:00:59 +0000
committerRichard Sandiford <rsandifo@gcc.gnu.org>2014-05-07 18:00:59 +0000
commit1a51f10c8157788eb15dcad754dd32acdae1114e (patch)
tree3c6eab80bd9a0dfc48595e9bd7ff71e2af86f0c7 /gcc
parent5b1e4b475b36176466d47f4b045a96e4de5c3f86 (diff)
downloadgcc-1a51f10c8157788eb15dcad754dd32acdae1114e.zip
gcc-1a51f10c8157788eb15dcad754dd32acdae1114e.tar.gz
gcc-1a51f10c8157788eb15dcad754dd32acdae1114e.tar.bz2
re PR sanitizer/61095 (miscompile: tsan is broken in gcc trunk, works in 4.9)
gcc/ PR tree-optimization/61095 * tree-ssanames.c (get_nonzero_bits): Fix type extension in wi::shwi. From-SVN: r210181
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/tree-ssanames.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index afac89b..a12b4a3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-07 Richard Sandiford <rsandifo@linux.vnet.ibm.com>
+
+ PR tree-optimization/61095
+ * tree-ssanames.c (get_nonzero_bits): Fix type extension in wi::shwi.
+
2014-05-07 Richard Biener <rguenther@suse.de>
PR tree-optimization/61034
diff --git a/gcc/tree-ssanames.c b/gcc/tree-ssanames.c
index fa7eaf3..20a2c3f 100644
--- a/gcc/tree-ssanames.c
+++ b/gcc/tree-ssanames.c
@@ -271,7 +271,8 @@ get_nonzero_bits (const_tree name)
{
struct ptr_info_def *pi = SSA_NAME_PTR_INFO (name);
if (pi && pi->align)
- return wi::shwi (-(int) pi->align | pi->misalign, precision);
+ return wi::shwi (-(HOST_WIDE_INT) pi->align
+ | (HOST_WIDE_INT) pi->misalign, precision);
return wi::shwi (-1, precision);
}