From 810b14c503fa1d8d9b2a64c25099861452e5089b Mon Sep 17 00:00:00 2001 From: rguenth Date: Wed, 26 May 2010 11:29:20 +0000 Subject: [PATCH] 2010-05-26 Richard Guenther Backport from mainline: 2010-04-15 Richard Guenther * alias.c (alias_set_subset_of): Handle alias-set zero child properly. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_5-branch@159864 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 8 ++++++++ gcc/alias.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3f8c0d84504..1276c8ca3d4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2010-05-26 Richard Guenther + + Backport from mainline: + 2010-04-15 Richard Guenther + + * alias.c (alias_set_subset_of): Handle alias-set zero + child properly. + 2010-05-26 Jakub Jelinek PR target/44199 diff --git a/gcc/alias.c b/gcc/alias.c index 19e834b726c..7d3d343e147 100644 --- a/gcc/alias.c +++ b/gcc/alias.c @@ -406,7 +406,7 @@ alias_set_subset_of (alias_set_type set1, alias_set_type set2) /* Otherwise, check if set1 is a subset of set2. */ ase = get_alias_set_entry (set2); if (ase != 0 - && ((ase->has_zero_child && set1 == 0) + && (ase->has_zero_child || splay_tree_lookup (ase->children, (splay_tree_key) set1))) return true; -- 2.11.4.GIT