diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7936dc28976c..0970d0202e04 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2001-08-19  Richard Henderson  <rth@redhat.com>
+
+	* function.c (gen_mem_addressof): Don't call get_alias_set if no decl.
+
 2001-08-19  Richard Henderson  <rth@redhat.com>
 
 	* config/ia64/ia64.h (STRIP_NAME_ENCODING): Handle @ and *
diff --git a/gcc/function.c b/gcc/function.c
index c2424fd0732a..6c8a9374d51b 100644
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -2863,7 +2863,7 @@ gen_mem_addressof (reg, decl)
 			     REGNO (reg), decl);
 
   /* Calculate this before we start messing with decl's RTL.  */
-  HOST_WIDE_INT set = get_alias_set (decl);
+  HOST_WIDE_INT set = decl ? get_alias_set (decl) : 0;
 
   /* If the original REG was a user-variable, then so is the REG whose
      address is being taken.  Likewise for unchanging.  */