diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fc48767f83a8470f782457c02fdee14569de9762..e53935627bf1c5c5517d91f6c12b400d8d39dc4a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-10  Alexandre Oliva  <aoliva@redhat.com>
+
+	* c-gimplify.c (c_genericize): Don't refer to DECL_ASSEMBLER_NAME
+	before ensuring it's already computed.
+
 2008-10-09  Jakub Jelinek  <jakub@redhat.com>
 
 	* rtl.h (locator_eq): New decl.
diff --git a/gcc/c-gimplify.c b/gcc/c-gimplify.c
index 342848acd294f3e72f8005cd9d130ba60c947d8b..5b309343361d4a8700ddd8dd185087fc27596433 100644
--- a/gcc/c-gimplify.c
+++ b/gcc/c-gimplify.c
@@ -2,7 +2,8 @@
    by the C-based front ends.  The structure of gimplified, or
    language-independent, trees is dictated by the grammar described in this
    file.
-   Copyright (C) 2002, 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008
+   Free Software Foundation, Inc.
    Lowering of expressions contributed by Sebastian Pop <s.pop@laposte.net>
    Re-written to support lowering of whole function trees, documentation
    and miscellaneous cleanups by Diego Novillo <dnovillo@redhat.com>
@@ -87,7 +88,8 @@ c_genericize (tree fndecl)
       fprintf (dump_orig, "\n;; Function %s",
 	       lang_hooks.decl_printable_name (fndecl, 2));
       fprintf (dump_orig, " (%s)\n",
-	       IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (fndecl)));
+	       (!DECL_ASSEMBLER_NAME_SET_P (fndecl) ? "null"
+		: IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (fndecl))));
       fprintf (dump_orig, ";; enabled by -%s\n", dump_flag_name (TDI_original));
       fprintf (dump_orig, "\n");