merge from gcc

[external/binutils.git] / gdb / libunwind-frame.c

diff --git a/gdb/libunwind-frame.c b/gdb/libunwind-frame.c
index d580b51..481b6b2 100644 (file)
--- a/gdb/libunwind-frame.c
+++ b/gdb/libunwind-frame.c
@@ -1,6 +1,7 @@
 /* Frame unwinder for frames using the libunwind library.
 
-   Copyright (C) 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010
+   Free Software Foundation, Inc.
 
    Written by Jeff Johnston, contributed by Red Hat Inc.
 
@@ -277,8 +278,6 @@ libunwind_frame_this_id (struct frame_info *this_frame, void **this_cache,
 
   if (cache != NULL)
     (*this_id) = frame_id_build (cache->base, cache->func_addr);
-  else
-    (*this_id) = null_frame_id;
 }
 
 struct value *