diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 53b05e939f..66006b16ec 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,7 @@
 2011-03-01  Michael Snyder  <msnyder@vmware.com>
 
+	* dwarf2read.c (dwarf2_compute_name): NAME cannot be null here.
+
 	* cli/cli-dump.c (restore_binary_file): Validate ftell return value.
 
 	* ada-lang.c (ada_make_symbol_completion_list): Replace malloc
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index c62e324f58..a255eefd53 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -4849,7 +4849,7 @@ dwarf2_compute_name (char *name, struct die_info *die, struct dwarf2_cu *cu,
 	      xfree (prefixed_name);
 	    }
 	  else
-	    fputs_unfiltered (name ? name : "", buf);
+	    fputs_unfiltered (name, buf);
 
 	  /* Template parameters may be specified in the DIE's DW_AT_name, or
 	     as children with DW_TAG_template_type_param or