aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/alias.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0b6da05..3610918 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-15 Richard Guenther <rguenther@suse.de>
+
+ * alias.c (alias_set_subset_of): Handle alias-set zero
+ child properly.
+
2010-04-15 Mark Shinwell <shinwell@codesourcery.com>
Julian Brown <julian@codesourcery.com>
diff --git a/gcc/alias.c b/gcc/alias.c
index c10b971..4be7085 100644
--- a/gcc/alias.c
+++ b/gcc/alias.c
@@ -413,7 +413,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;