Fix PR 17206
As reported in PR 17206, an internal error is triggered when command until is executed. In infcmd.c:until_next_command, step_range_end is set to 'pc', if (!func) { struct bound_minimal_symbol msymbol = lookup_minimal_symbol_by_pc (pc); if (msymbol.minsym == NULL) error (_("Execution is not within a known function.")); tp->control.step_range_start = BMSYMBOL_VALUE_ADDRESS (msymbol); tp->control.step_range_end = pc; } and later in infrun.c:resume, the assert below is triggered in PR 17206. if (tp->control.may_range_step) { /* If we're resuming a thread with the PC out of the step range, then we're doing some nested/finer run control operation, like stepping the thread out of the dynamic linker or the displaced stepping scratch pad. We shouldn't have allowed a range step then. */ gdb_assert (pc_in_thread_step_range (pc, tp)); } In until_next_command, we set step range to [XXX, pc), so pc isn't within the range. pc_in_thread_step_range returns false and the assert is triggered. AFAICS, the range we want in until_next_command is [XXX, pc] instead of [XXX, pc), because we want to program step until greater than pc. This patch is to set step_range_end to 'pc + 1'. Running until-nodebug.exp with unpatched GDB will get the following fail, FAIL: gdb.base/until-nodebug.exp: until 2 (GDB internal error) and the fail goes away when the fix is applied. gdb: 2014-07-29 Yao Qi <yao@codesourcery.com> PR gdb/17206 * infcmd.c (until_next_command): Set step_range_end to PC + 1. gdb/testsuite: 2014-07-29 Yao Qi <yao@codesourcery.com> PR gdb/17206 * gdb.base/until-nodebug.exp: New.
This commit is contained in:
parent
7ebdbe9292
commit
7e09a22367
|
@ -1,3 +1,8 @@
|
|||
2014-07-29 Yao Qi <yao@codesourcery.com>
|
||||
|
||||
PR gdb/17206
|
||||
* infcmd.c (until_next_command): Set step_range_end to PC + 1.
|
||||
|
||||
2014-07-28 Doug Evans <xdje42@gmail.com>
|
||||
|
||||
PR guile/17203
|
||||
|
|
|
@ -1359,7 +1359,9 @@ until_next_command (int from_tty)
|
|||
error (_("Execution is not within a known function."));
|
||||
|
||||
tp->control.step_range_start = BMSYMBOL_VALUE_ADDRESS (msymbol);
|
||||
tp->control.step_range_end = pc;
|
||||
/* The upper-bound of step_range is exclusive. In order to make PC
|
||||
within the range, set the step_range_end with PC + 1. */
|
||||
tp->control.step_range_end = pc + 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
@ -1,3 +1,8 @@
|
|||
2014-07-29 Yao Qi <yao@codesourcery.com>
|
||||
|
||||
PR gdb/17206
|
||||
* gdb.base/until-nodebug.exp: New.
|
||||
|
||||
2014-07-28 Doug Evans <xdje42@gmail.com>
|
||||
|
||||
PR guile/17203
|
||||
|
|
|
@ -0,0 +1,37 @@
|
|||
# Copyright 2014 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/>. */
|
||||
|
||||
# Test that the address range for stepping is correctly set in command
|
||||
# until when there is no debug information.
|
||||
|
||||
standard_testfile advance.c
|
||||
|
||||
if {[prepare_for_testing "failed to prepare" $testfile $srcfile nodebug]} {
|
||||
return -1
|
||||
}
|
||||
|
||||
if ![runto_main] {
|
||||
fail "Can't run to main"
|
||||
return 0
|
||||
}
|
||||
|
||||
# Without debug information, the program stops at the next
|
||||
# instruction, which is still in main.
|
||||
gdb_test "until" "in main .*" "until 1"
|
||||
|
||||
# If the stepping range is correctly set, the program stops at the next
|
||||
# instruction. Otherwise, an internal error will be triggered. See
|
||||
# PR gdb/17206.
|
||||
gdb_test "until" "in main .*" "until 2"
|
Loading…
Reference in New Issue