paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-12 18:49:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

* handle case where the first instruction with line information is looked up

Browse Source 
o this should be handled better. The common way is looking up address - 1,
     but that doesn't seem to work here.

git-svn-id: trunk@49142 -
This commit is contained in:
Jonas Maebe 2021-04-08 19:50:40 +00:00
parent 7b5e58382b
commit f13b47289e
1 changed files with 15 additions and 5 deletions

20
rtl/inc/lnfodwrf.pp
View File

@ -896,7 +896,10 @@ begin
end;
{ when we have found the address we need to return the previous
line because that contains the call instruction }
line because that contains the call instruction
Note that there may not be any call instruction, because this may
be the actual instruction that crashed, and it may be on the first
line of the function }
if (state.segment > segment) or
((state.segment = segment) and
(state.address >= addr)) then
@ -918,10 +921,17 @@ begin
opcode := ReadNext();
end;
if (found) then begin
line := prev_line;
source := GetFullFilename(file_names, include_directories, prev_file);
end;
if (found) then
begin
{ can happen if the crash happens on the first instruction with line info }
if prev_line = 0 then
begin
prev_line := state.line;
prev_file := state.file_id;
end;
line := prev_line;
source := GetFullFilename(file_names, include_directories, prev_file);
end;
end;