* breakpoint.c (resolve_sal_pc): Preserve original line number
	when skipping prologue.
gdb/testsuite
	Update for change to prologue skipping:
	* gdb.mi/mi2-simplerun.exp: Update.
	* gdb.mi/mi2-break.exp: Update.
	* gdb.mi/mi-simplerun.exp: Update.
	* gdb.mi/mi-break.exp: Update.
	* gdb.base/ending-run.exp: Update.
This commit is contained in:
Tom Tromey
2009-03-26 23:30:12 +00:00
parent a5321aa4d5
commit 56ef84b1f1
8 changed files with 30 additions and 11 deletions

View File

@@ -5765,7 +5765,12 @@ resolve_sal_pc (struct symtab_and_line *sal)
/* If this SAL corresponds to a breakpoint inserted using
a line number, then skip the function prologue if necessary. */
if (sal->explicit_line)
skip_prologue_sal (sal);
{
/* Preserve the original line number. */
int saved_line = sal->line;
skip_prologue_sal (sal);
sal->line = saved_line;
}
}
if (sal->section == 0 && sal->symtab != NULL)