diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ae1179991da..53cb77e3fc9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-30  Diego Novillo  <dnovillo@redhat.com>
+
+	* tree-ssa-alias.c (create_alias_map_for): Do not get the
+	alias set of the inner type of ARRAY_TYPEs.
+
 2004-07-29  Diego Novillo  <dnovillo@redhat.com>
 
 	* tree-ssa-ccp.c (visit_assignment): Move code to prevent
diff --git a/gcc/tree-ssa-alias.c b/gcc/tree-ssa-alias.c
index 7ad1867c453..2363ec95885 100644
--- a/gcc/tree-ssa-alias.c
+++ b/gcc/tree-ssa-alias.c
@@ -1253,11 +1253,7 @@ create_alias_map_for (tree var, struct alias_info *ai)
   struct alias_map_d *alias_map;
   alias_map = xcalloc (1, sizeof (*alias_map));
   alias_map->var = var;
-
-  if (TREE_CODE (TREE_TYPE (var)) == ARRAY_TYPE)
-    alias_map->set = get_alias_set (TREE_TYPE (TREE_TYPE (var)));
-  else
-    alias_map->set = get_alias_set (var);
+  alias_map->set = get_alias_set (var);
   ai->addressable_vars[ai->num_addressable_vars++] = alias_map;
 }