[PATCH v3 1/3] frame: add skip_tailcall_frames

Markus Metzger
2016-02-11T16:14:50Z

Add a new function skip_tailcall_frames to skip TAILCALL_FRAME frames.

2016-02-11 Markus Metzger <markus.t.metzger@intel.com>

gdb/
* frame.h (skip_tailcall_frames): New.
* frame.c (skip_tailcall_frames): New.
(frame_pop): Call skip_tailcall_frames.
* infcmd.c: Call skip_tailcall_frames.
---
gdb/frame.c | 14 ++++++++++++--
gdb/frame.h | 4 ++++
gdb/infcmd.c | 3 +--
3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/gdb/frame.c b/gdb/frame.c
index 48c9b33..b7832c7 100644
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -438,6 +438,17 @@ skip_artificial_frames (struct frame_info *frame)
return frame;
}

+/* See frame.h. */
+
+struct frame_info *
+skip_tailcall_frames (struct frame_info *frame)
+{
+ while (get_frame_type (frame) == TAILCALL_FRAME)
+ frame = get_prev_frame (frame);
+
+ return frame;
+}
+
/* Compute the frame's uniq ID that can be used to, later, re-find the
frame. */

@@ -972,8 +983,7 @@ frame_pop (struct frame_info *this_frame)

/* Ignore TAILCALL_FRAME type frames, they were executed already before
entering THISFRAME. */
- while (get_frame_type (prev_frame) == TAILCALL_FRAME)
- prev_frame = get_prev_frame (prev_frame);
+ prev_frame = skip_tailcall_frames (prev_frame);

/* Make a copy of all the register values unwound from this frame.
Save them in a scratch buffer so that there isn't a race between
diff --git a/gdb/frame.h b/gdb/frame.h
index 2e05dfa..7e8b01e 100644
--- a/gdb/frame.h
+++ b/gdb/frame.h
@@ -820,5 +820,9 @@ extern int frame_unwinder_is (struct frame_info *fi,

extern enum language get_frame_language (struct frame_info *frame);

+/* Return the first non-tailcall frame above FRAME or FRAME if it is not a
+ tailcall frame. */
+
+extern struct frame_info *skip_tailcall_frames (struct frame_info *frame);

#endif /* !defined (FRAME_H) */
diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index df13896..930dc61 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -2002,8 +2002,7 @@ finish_command (char *arg, int from_tty)

/* Ignore TAILCALL_FRAME type frames, they were executed already before
entering THISFRAME. */
- while (get_frame_type (frame) == TAILCALL_FRAME)
- frame = get_prev_frame (frame);
+ frame = skip_tailcall_frames (frame);

/* Find the function we will return from. */

--
1.8.3.1