3 files changed, 8 insertions, 16 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 49ad68f..d091e2e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
 2003-03-03  Andrew Cagney  <cagney@redhat.com>
 
+	* frame.c (frame_id_unwind): Delete function.
+	(get_prev_frame): Use prev's unwinder to unwind the frame ID.
+	* frame.h (frame_id_unwind): Delete declaration.
+
+2003-03-03  Andrew Cagney  <cagney@redhat.com>
+
 	Make MAX_REGISTER_RAW_SIZE and MAX_REGISTER_VIRTUAL_SIZE optional.
 	* gdbarch.sh (DEPRECATED_MAX_REGISTER_RAW_SIZE): Variable with
 	predicate.  Replace MAX_REGISTER_RAW_SIZE.
diff --git a/gdb/frame.c b/gdb/frame.c
index f4e0a14..a8c3ce9 100644
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -145,17 +145,6 @@ frame_pc_unwind (struct frame_info *frame)
   return frame->pc_unwind_cache;
 }
 
-struct frame_id
-frame_id_unwind (struct frame_info *frame)
-{
-  if (!frame->id_unwind_cache_p)
-    {
-      frame->unwind->id (frame, &frame->unwind_cache, &frame->id_unwind_cache);
-      frame->id_unwind_cache_p = 1;
-    }
-  return frame->id_unwind_cache;
-}
-
 void
 frame_pop (struct frame_info *frame)
 {
@@ -1347,7 +1336,8 @@ get_prev_frame (struct frame_info *next_frame)
   {
     /* FIXME: cagney/2002-12-18: Instead of this hack, should just
        save the frame ID directly.  */
-    struct frame_id id = frame_id_unwind (next_frame);
+    struct frame_id id = prev_frame->unwind->id (next_frame,
+						 &prev_frame->unwind_cache);
     /* Check that the unwound ID is valid.  As of 2003-02-24 the
        x86-64 was returning an invalid frame ID when trying to do an
        unwind a sentinel frame that belonged to a frame dummy.  */
diff --git a/gdb/frame.h b/gdb/frame.h
index bd20ba7..8dd5c93 100644
--- a/gdb/frame.h
+++ b/gdb/frame.h
@@ -310,10 +310,6 @@ extern const char *frame_map_regnum_to_name (int regnum);
 
 extern CORE_ADDR frame_pc_unwind (struct frame_info *frame);
 
-/* Unwind the frame ID.  Return an ID that uniquely identifies the
-   caller's frame.  */
-extern struct frame_id frame_id_unwind (struct frame_info *frame);
-
 /* Discard the specified frame.  Restoring the registers to the state
    of the caller.  */
 extern void frame_pop (struct frame_info *frame);