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

* fixed overzealous removal of an assigned(t1) check in r40142 (it was for a

Browse Source 
ttryexceptnode instead of for a ttryfinally node)

git-svn-id: trunk@40189 -
This commit is contained in:
Jonas Maebe 2018-11-02 21:12:18 +00:00
parent a19528efa1
commit 513481ad71
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
compiler/x86_64/nx64flw.pas
View File

@ -458,12 +458,28 @@ procedure tx64tryexceptnode.pass_generate_code;
inc(onnodecount.value); inc(onnodecount.value);
hnode:=tonnode(hnode).left; hnode:=tonnode(hnode).left;
end; end;
{ add 'else' node to the filter list, too }
if assigned(t1) then
begin
hlist.concat(tai_const.create_32bit(-1));
hlist.concat(tai_const.create_rva_sym(lastonlabel));
inc(onnodecount.value);
end;
{ now move filter table to permanent list all at once } { now move filter table to permanent list all at once }
current_procinfo.aktlocaldata.concatlist(hlist); current_procinfo.aktlocaldata.concatlist(hlist);
hlist.free; hlist.free;
end; end;
cg.a_label(current_asmdata.CurrAsmList,lastonlabel); cg.a_label(current_asmdata.CurrAsmList,lastonlabel);
if assigned(t1) then
begin
{ here we don't have to reset flowcontrol }
{ the default and on flowcontrols are handled equal }
secondpass(t1);
cg.g_call(current_asmdata.CurrAsmList,'FPC_DONEEXCEPTION');
if (flowcontrol*[fc_exit,fc_break,fc_continue]<>[]) then
cg.a_jmp_always(current_asmdata.CurrAsmList,endexceptlabel);
end;
exceptflowcontrol:=flowcontrol; exceptflowcontrol:=flowcontrol;
if fc_exit in exceptflowcontrol then if fc_exit in exceptflowcontrol then