]> git.ipfire.org Git - thirdparty/binutils-gdb.git/commit
btrace: fix PR gdb/19829
authorMarkus Metzger <markus.t.metzger@intel.com>
Fri, 5 Feb 2016 08:32:53 +0000 (09:32 +0100)
committerMarkus Metzger <markus.t.metzger@intel.com>
Thu, 17 Mar 2016 10:48:49 +0000 (11:48 +0100)
commit2ef34d11f61d79dcb152713aa059051d8cd3295d
treefcba0ae0b1c2a8d90449061210892c64220c0020
parent6c410d3b60cfdab8211565db240fe783e18a73a4
btrace: fix PR gdb/19829

This is a backport of

33b4777ca1b7 btrace, frame: fix crash in get_frame_type
a038fa3e14a4 stack: check frame_unwind_caller_id
2f3ef606b912 frame: add skip_tailcall_frames

In skip_artificial_frames we repeatedly call get_prev_frame_always until we get
a non-inline and non-tailcall frame assuming that there must be such a frame
eventually.

For record targets, however, we may have a frame chain that consists only of
artificial frames.  This leads to a crash in get_frame_type when dereferencing a
NULL frame pointer.

Change skip_artificial_frames and skip_tailcall_frames to return NULL in such a
case and modify each caller to cope with a NULL return.

In frame_unwind_caller_pc and frame_unwind_caller_arch, we simply assert that
the returned value is not NULL.  Their caller was supposed to check
frame_unwind_caller_id before calling those functions.

In other cases, we thrown an error.

In infcmd further move the skip_tailcall_frames call to the forward-stepping
case since we don't need a frame for reverse execution and we don't want to fail
because of that.  Reverse-finish does make sense for a tailcall frame.

gdb/
* frame.h (skip_tailcall_frames): New.
* infcmd.c (finish_command): Call skip_tailcall_frames.
* frame.c (skip_artificial_frames): Return NULL if only artificial frames
are found.  Update comment.
(frame_pop): Call skip_tailcall_frames.
(frame_unwind_caller_id): Handle NULL return.
(frame_unwind_caller_pc, frame_unwind_caller_arch): Assert that
skip_artificial_frames does not return NULL.
(frame_pop): Add an error if only tailcall frames are found.
* infcmd.c (finish_command): Move skip_tailcall_frames call into forward-
execution case.  Add an error if only tailcall frames are found.
* stack.c (frame_info): Check frame_unwind_caller_id.

testsuite/
* gdb.btrace/tailcall-only.exp: New.
* gdb.btrace/tailcall-only.c: New.
* gdb.btrace/x86_64-tailcall-only.S: New.
* gdb.btrace/i686-tailcall-only.S: New.
gdb/ChangeLog
gdb/frame.c
gdb/frame.h
gdb/infcmd.c
gdb/stack.c
gdb/testsuite/ChangeLog
gdb/testsuite/gdb.btrace/i686-tailcall-only.S [new file with mode: 0644]
gdb/testsuite/gdb.btrace/tailcall-only.c [new file with mode: 0644]
gdb/testsuite/gdb.btrace/tailcall-only.exp [new file with mode: 0644]
gdb/testsuite/gdb.btrace/x86_64-tailcall-only.S [new file with mode: 0644]