Files
binutils-gdb/gdb/testsuite/gdb.opt/inline-break.c
Keith Seitz 83b9557361 Report stop locations in inlined functions
This is a patch for a very related inline function problem.  Using the
test case from breakpoints/17534,

3	static inline void NVIC_EnableIRQ(int IRQn)
4	{
5	  volatile int y;
6	  y = IRQn;
7	}
8
9	__attribute__( ( always_inline ) ) static inline void __WFI(void)
10	{
11	    __asm volatile ("nop");
12	}
13
14	int main(void) {
15
16	    x= 42;
17
18	    if (x)
19	      NVIC_EnableIRQ(16);
20	    else
21	      NVIC_EnableIRQ(18);
(gdb) b NVIC_EnableIRQ
Breakpoint 1 at 0x4003e4: NVIC_EnableIRQ. (2 locations)
(gdb) r
Starting program: 17534

Breakpoint 1, main () at 17534.c:19
19	      NVIC_EnableIRQ(16);

This happens because skip_inline_frames automatically skips every inlined
frame.  Based on a suggestion by Jan, this patch introduces a new function,
breakpoint_for_stop, which attempts to ascertain which breakpoint, if any,
caused a particular stop in the inferior.  That breakpoint is then passed
to skip_inline_frames so that it can decide if a particular inlined frame
should be skipped.

I've had to separate the bpstat chain building from bpstat_stop_status --
py-finish-breakpoint.exp did not like me calling bpstat_stop_status multiple
times.  So I've added the ability to allocate the chain separately and
optionally pass it to bpstat_stop_status, which remains otherwise unchanged.

With this patch, GDB now correctly reports that the inferior has stopped
inside the inlined function:

(gdb) r
Starting program: 17534

Breakpoint 1, NVIC_EnableIRQ (IRQn=16) at 17534.c:6
6	  y = IRQn;


gdb/ChangeLog:

	* breakpoint.c (bpstat_explains_signal): Add output parameter for
	breakpoint and save the breakpoint if one is found to explain
	the signal.
	All callers updated.
	(build_bpstat_chain): New function, moved from bpstat_stop_status.
	(breakpoint_for_stop): New function.
	(bpstat_stop_status): Add new optional parameter for the bpstat chain.
	If this new parameter is NULL, call build_bpstat_chain.
	All callers updated.
	* breakpoint.h (breakpoint_for_stop): Declare.
	(bpstat_explains_signal): Update declaration.
	* infrun.c (handle_signal_stop): Before calling skip_inline_frames,
	use breakpoint_for_stop to find the breakpoint that caused us
	to stop.
	Save the bpstat chain for later invocation of bpstat_stop_status.
	* inline-frame.c: Include linespec.h.
	(skip_inline_frames): Add struct breakpoint parameter.
	Re-parse the location of the breakpoint causing the stop, if any,
	and only skip frames that did not cause the stop.
	* inline-frame.h (skip_inline_frames): Update declaration.

gdb/testsuite/ChangeLog:

	* gdb.opt/inline-break.c (inline_func1, not_inline_func1)
	(inline_func2, not_inline_func2, inline_func3, not_inline_func3):
	New functions.
	(main): Call not_inline_func3.
	* gdb.opt/inline-break.exp: Start inferior and set breakpoints at
	inline_func1, inline_func2, and inline_func3.  Test that when each
	breakpoint is hit, GDB properly reports both the stop location
	and the backtrace.
2017-11-28 12:39:19 -08:00

210 lines
3.6 KiB
C

/* This testcase is part of GDB, the GNU debugger.
Copyright (C) 2012-2017 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* The file ../gdb.dwarf2/inline-break.S was generated manually from
this file, and should be regenerated if this file is modified. */
#ifdef __GNUC__
# define ATTR __attribute__((gnu_inline)) __attribute__((always_inline))
#else
# define ATTR
#endif
/* A static inlined function that is called once. */
static inline ATTR int
func1 (int x)
{
return x * 23;
}
/* A non-static inlined function that is called once. */
inline ATTR int
func2 (int x)
{
return x * 17;
}
/* A static inlined function that calls another static inlined
function. */
static inline ATTR int
func3b (int x)
{
return x < 14 ? 1 : 2;
}
static inline ATTR int
func3a (int x)
{
return func3b (x * 23);
}
/* A non-static inlined function that calls a static inlined
function. */
static inline ATTR int
func4b (int x)
{
return x < 13 ? 1 : 2;
}
inline ATTR int
func4a (int x)
{
return func4b (x * 17);
}
/* A static inlined function that calls a non-static inlined
function. */
inline ATTR int
func5b (int x)
{
return x < 12 ? 1 : 2;
}
static inline ATTR int
func5a (int x)
{
return func5b (x * 23);
}
/* A non-static inlined function that calls another non-static inlined
function. */
inline ATTR int
func6b (int x)
{
return x < 14 ? 3 : 2;
}
inline ATTR int
func6a (int x)
{
return func6b (x * 17);
}
/* A static inlined function that is called more than once. */
static inline ATTR int
func7b (int x)
{
return x < 23 ? 1 : 4;
}
static inline ATTR int
func7a (int x)
{
return func7b (x * 29);
}
/* A non-static inlined function that is called more than once. */
inline ATTR int
func8b (int x)
{
return x < 7 ? 11 : 9;
}
static inline ATTR int
func8a (int x)
{
return func8b (x * 31);
}
static inline ATTR int
inline_func1 (int x)
{
int y = 1; /* inline_func1 */
return y + x;
}
static int
not_inline_func1 (int x)
{
int y = 2; /* not_inline_func1 */
return y + inline_func1 (x);
}
inline ATTR int
inline_func2 (int x)
{
int y = 3; /* inline_func2 */
return y + not_inline_func1 (x);
}
int
not_inline_func2 (int x)
{
int y = 4; /* not_inline_func2 */
return y + inline_func2 (x);
}
static inline ATTR int
inline_func3 (int x)
{
int y = 5; /* inline_func3 */
return y + not_inline_func2 (x);
}
static int
not_inline_func3 (int x)
{
int y = 6; /* not_inline_func3 */
return y + inline_func3 (x);
}
/* Entry point. */
int
main (int argc, char *argv[])
{
/* Declaring x as volatile here prevents GCC from combining calls.
If GCC is allowed to combine calls then some of them end up with
no instructions at all, so there is no specific address for GDB
to set a breakpoint at. */
volatile int x = argc;
x = func1 (x);
x = func2 (x);
x = func3a (x);
x = func4a (x);
x = func5a (x);
x = func6a (x);
x = func7a (x) + func7b (x);
x = func8a (x) + func8b (x);
x = not_inline_func3 (-21);
return x;
}