diff options
| author | rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-03-09 14:01:16 +0000 |
|---|---|---|
| committer | rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-03-09 14:01:16 +0000 |
| commit | 42bb3bfb5f84161a6cebcaf634deffc523c9c1f5 (patch) | |
| tree | 856dd388eca493e1a07eeffc5445802c06df4ea4 /gcc/c-family | |
| parent | efba66740a2a0e5a4f8b26c6e780129a2dfcc8ae (diff) | |
| download | gcc-42bb3bfb5f84161a6cebcaf634deffc523c9c1f5.tar.gz | |
2016-03-09 Richard Biener <rguenther@suse.de>
c-family/
PR c/70143
* c-common.c (strict_aliasing_warning): Add back
alias_sets_conflict_p check.
* gcc.dg/Wstrict-aliasing-bogus-upcast.c: New testcase.
* gcc.dg/Wstrict-aliasing-struct-with-char-member.c: Likewise.
* gcc.dg/Wstrict-aliasing-struct-member.c: Remove again.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@234084 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/c-family')
| -rw-r--r-- | gcc/c-family/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/c-family/c-common.c | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index 464297b6539..534d6058870 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,9 @@ +2016-03-09 Richard Biener <rguenther@suse.de> + + PR c/70143 + * c-common.c (strict_aliasing_warning): Add back + alias_sets_conflict_p check. + 2016-03-08 Jason Merrill <jason@redhat.com> * c-opts.c (set_std_cxx1z): Don't enable concepts. diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c index 965cf493699..08b761c4776 100644 --- a/gcc/c-family/c-common.c +++ b/gcc/c-family/c-common.c @@ -1568,7 +1568,9 @@ strict_aliasing_warning (tree otype, tree type, tree expr) alias_set_type set2 = get_alias_set (TREE_TYPE (type)); if (set1 != set2 && set2 != 0 - && (set1 == 0 || !alias_set_subset_of (set2, set1))) + && (set1 == 0 + || (!alias_set_subset_of (set2, set1) + && !alias_sets_conflict_p (set1, set2)))) { warning (OPT_Wstrict_aliasing, "dereferencing type-punned " "pointer will break strict-aliasing rules"); |