MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Inline breakpoints

Browse Source 
gdb/ChangeLog:
yyyy-mm-dd  Pedro Alves  <palves@redhat.com>

	* inline-frame.c (stopped_by_user_bp_inline_frame): Replace PC
	parameter with a block parameter.  Compare location's block symbol
	with the frame's block instead of addresses.
	(skip_inline_frames): Pass the current block instead of the
	frame's address.  Break out as soon as we determine the frame
	should not be skipped.

gdb/testsuite/ChangeLog:
yyyy-mm-dd  Pedro Alves  <palves@redhat.com>

	* gdb.opt/inline-break.c (func_callee, func_caller): New.
	(main): Call func_caller.
This commit is contained in:
Pedro Alves 2018-06-14 12:23:56 +01:00
parent 1d39de443a
commit a898ca0e0c
3 changed files with 49 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gdb/inline-frame.c
View File

@ -286,11 +286,10 @@ block_starting_point_at (CORE_ADDR pc, const struct block *block)
} }
/* Loop over the stop chain and determine if execution stopped in an /* Loop over the stop chain and determine if execution stopped in an
inlined frame because of a user breakpoint. THIS_PC is the current inlined frame because of a user breakpoint set at FRAME_BLOCK. */
frame's PC. */
static bool static bool
stopped_by_user_bp_inline_frame (CORE_ADDR this_pc, bpstat stop_chain) stopped_by_user_bp_inline_frame (const block *frame_block, bpstat stop_chain)
{ {
for (bpstat s = stop_chain; s != NULL; s = s->next) for (bpstat s = stop_chain; s != NULL; s = s->next)
{ {
@ -301,9 +300,9 @@ stopped_by_user_bp_inline_frame (CORE_ADDR this_pc, bpstat stop_chain)
bp_location *loc = s->bp_location_at; bp_location *loc = s->bp_location_at;
enum bp_loc_type t = loc->loc_type; enum bp_loc_type t = loc->loc_type;
if (loc->address == this_pc if ((t == bp_loc_software_breakpoint
&& (t == bp_loc_software_breakpoint || t == bp_loc_hardware_breakpoint)
|| t == bp_loc_hardware_breakpoint)) && frame_block == SYMBOL_BLOCK_VALUE (loc->symbol))
return true; return true;
} }
} }
@ -340,12 +339,12 @@ skip_inline_frames (ptid_t ptid, bpstat stop_chain)
{ {
/* Do not skip the inlined frame if execution /* Do not skip the inlined frame if execution
stopped in an inlined frame because of a user stopped in an inlined frame because of a user
breakpoint. */ breakpoint for this inline function. */
if (!stopped_by_user_bp_inline_frame (this_pc, stop_chain)) if (stopped_by_user_bp_inline_frame (cur_block, stop_chain))
{ break;
skip_count++;
last_sym = BLOCK_FUNCTION (cur_block); skip_count++;
} last_sym = BLOCK_FUNCTION (cur_block);
} }
else else
break; break;

21
gdb/testsuite/gdb.opt/inline-break.c
View File

@ -176,6 +176,25 @@ not_inline_func3 (int x)
return y + inline_func3 (x); return y + inline_func3 (x);
} }
/* A static inlined function that is called by another static inlined
function. */
static inline ATTR int
func_callee (int x)
{
return x * 23;
}
/* A static inlined function that calls another static inlined
function. The body of the function is as simple as possible so
that both functions are inlined to the same PC address. */
static int
func_caller (int x)
{
return func_callee (x);
}
/* Entry point. */ /* Entry point. */
int int
@ -205,5 +224,7 @@ main (int argc, char *argv[])
x = not_inline_func3 (-21); x = not_inline_func3 (-21);
func_caller (1);
return x; return x;
} }

17
gdb/testsuite/gdb.opt/inline-break.exp
View File

@ -231,4 +231,21 @@ foreach_with_prefix cmd [list "break" "tbreak"] {
} }
} }
# func_caller and func_callee are both inline functions, and one calls
# the other. Test that setting a breakpoint on the caller reports the
# stop at the caller, and that setting a breakpoint at the callee
# reports a stop at the callee.
foreach_with_prefix func {"func_callee" "func_caller"} {
clean_restart $binfile
if {![runto main]} {
untested "could not run to main"
continue
}
gdb_breakpoint $func
gdb_test "continue" "Breakpoint .* $func .*at .*$srcfile.*" \
"continue to inline function"
}
unset -nocomplain results unset -nocomplain results