diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f6f8a862a6fd..4384c635059a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-23  Richard Guenther  <rguenther@suse.de>
+
+	* alias.c (get_alias_set): For INDIRECT_REFs, deal with
+	SSA_NAME pointers.
+
 2007-10-22  Seongbae Park <seongbae.park@gmail.com>
 	David S. Miller  <davem@davemloft.net>
 
diff --git a/gcc/alias.c b/gcc/alias.c
index 6bf67f3574ff..bd5c277f05aa 100644
--- a/gcc/alias.c
+++ b/gcc/alias.c
@@ -525,7 +525,12 @@ get_alias_set (tree t)
       /* Check for accesses through restrict-qualified pointers.  */
       if (INDIRECT_REF_P (inner))
 	{
-	  tree decl = find_base_decl (TREE_OPERAND (inner, 0));
+	  tree decl;
+
+	  if (TREE_CODE (TREE_OPERAND (inner, 0)) == SSA_NAME)
+	    decl = SSA_NAME_VAR (TREE_OPERAND (inner, 0));
+ 	  else
+	    decl = find_base_decl (TREE_OPERAND (inner, 0));
 
 	  if (decl && DECL_POINTER_ALIAS_SET_KNOWN_P (decl))
 	    {