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

* fix Linux/i386 and Win32 after r43578

Browse Source 
git-svn-id: trunk@43583 -
This commit is contained in:
Jonas Maebe 2019-11-25 07:55:57 +00:00
parent be99031570
commit 0802edb710
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compiler/i386/n386flw.pas
View File

@ -375,6 +375,7 @@ procedure ti386tryfinallynode.pass_generate_code;
emit_scope_end;
if is_safecall then
begin
current_asmdata.getjumplabel(safecalllabel);
cg.a_jmp_always(current_asmdata.CurrAsmList,safecalllabel);
{ RTL handler will jump here on exception }
cg.a_label(current_asmdata.CurrAsmList,exceptlabel);

3
compiler/ncgutil.pas
View File

@ -767,7 +767,8 @@ implementation
parasize:=0;
{ For safecall functions with safecall-exceptions enabled the funcret is always returned as a para
which is considered a normal para on the c-side, so the funcret has to be pop'ed normally. }
if not current_procinfo.procdef.generate_safecall_wrapper then
if not current_procinfo.procdef.generate_safecall_wrapper and
paramanager.ret_in_param(current_procinfo.procdef.returndef,current_procinfo.procdef) then
inc(parasize,sizeof(pint));
end
else