paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-10-23 04:34:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

* avoid crash with procinfo ('merged')

Browse Source
This commit is contained in:
carl 2002-03-30 23:12:09 +00:00
parent c50d06d4de
commit 47a81e6215
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
compiler/nadd.pas
View File

@ -1449,7 +1449,8 @@ implementation
location.loc:=LOC_MEM; location.loc:=LOC_MEM;
calcregisters(self,0,0,0); calcregisters(self,0,0,0);
{ here we call SET... } { here we call SET... }
procinfo^.flags:=procinfo^.flags or pi_do_call; if assigned(procinfo) then
procinfo^.flags:=procinfo^.flags or pi_do_call;
end; end;
end end
@ -1466,14 +1467,16 @@ implementation
if is_widestring(ld) then if is_widestring(ld) then
begin begin
{ we use reference counted widestrings so no fast exit here } { we use reference counted widestrings so no fast exit here }
procinfo^.no_fast_exit:=true; if assigned(procinfo) then
procinfo^.no_fast_exit:=true;
{ this is only for add, the comparisaion is handled later } { this is only for add, the comparisaion is handled later }
location.loc:=LOC_REGISTER; location.loc:=LOC_REGISTER;
end end
else if is_ansistring(ld) then else if is_ansistring(ld) then
begin begin
{ we use ansistrings so no fast exit here } { we use ansistrings so no fast exit here }
procinfo^.no_fast_exit:=true; if assigned(procinfo) then
procinfo^.no_fast_exit:=true;
{ this is only for add, the comparisaion is handled later } { this is only for add, the comparisaion is handled later }
location.loc:=LOC_REGISTER; location.loc:=LOC_REGISTER;
end end
@ -1608,7 +1611,10 @@ begin
end. end.
{ {
$Log$ $Log$
Revision 1.42 2001-12-27 15:33:58 jonas Revision 1.43 2002-03-30 23:12:09 carl
* avoid crash with procinfo ('merged')
Revision 1.42 2001/12/27 15:33:58 jonas
* fixed fpuregister counting errors ("merged") * fixed fpuregister counting errors ("merged")
Revision 1.41 2001/10/20 19:28:37 peter Revision 1.41 2001/10/20 19:28:37 peter