paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-03 16:49:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

* save/restore the current_except_loc instead of invalidating it after each

Browse Source 
use (since try/except statements can be nested)

git-svn-id: branches/jvmbackend@19666 -
This commit is contained in:
Jonas Maebe 2011-11-21 18:48:19 +00:00
parent 4dee36b64b
commit 08565ce5be
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/jvm/njvmflw.pas
View File

@ -167,6 +167,7 @@ implementation
defaultcatchlabel: tasmlabel; defaultcatchlabel: tasmlabel;
oldflowcontrol,tryflowcontrol, oldflowcontrol,tryflowcontrol,
exceptflowcontrol : tflowcontrol; exceptflowcontrol : tflowcontrol;
prev_except_loc: tlocation;
begin begin
location_reset(location,LOC_VOID,OS_NO); location_reset(location,LOC_VOID,OS_NO);
@ -216,6 +217,7 @@ implementation
{ get the exception object from the stack and store it for use by { get the exception object from the stack and store it for use by
the exception code (in case of an anonymous "raise") } the exception code (in case of an anonymous "raise") }
current_asmdata.CurrAsmList.concat(tai_marker.create(mark_NoLineInfoStart)); current_asmdata.CurrAsmList.concat(tai_marker.create(mark_NoLineInfoStart));
prev_except_loc:=current_except_loc;
location_reset_ref(current_except_loc,LOC_REFERENCE,OS_ADDR,4); location_reset_ref(current_except_loc,LOC_REFERENCE,OS_ADDR,4);
tg.GetLocal(current_asmdata.CurrAsmList,sizeof(pint),java_jlthrowable,current_except_loc.reference); tg.GetLocal(current_asmdata.CurrAsmList,sizeof(pint),java_jlthrowable,current_except_loc.reference);
thlcgjvm(hlcg).incstack(current_asmdata.CurrAsmList,1); thlcgjvm(hlcg).incstack(current_asmdata.CurrAsmList,1);
@ -227,7 +229,7 @@ implementation
{ free the temp containing the exception and invalidate } { free the temp containing the exception and invalidate }
tg.UngetLocal(current_asmdata.CurrAsmList,current_except_loc.reference); tg.UngetLocal(current_asmdata.CurrAsmList,current_except_loc.reference);
current_except_loc.loc:=LOC_INVALID; current_except_loc:=prev_except_loc;
exceptflowcontrol:=flowcontrol; exceptflowcontrol:=flowcontrol;
end end
@ -255,6 +257,7 @@ implementation
thisonlabel : tasmlabel; thisonlabel : tasmlabel;
oldflowcontrol : tflowcontrol; oldflowcontrol : tflowcontrol;
exceptvarsym : tlocalvarsym; exceptvarsym : tlocalvarsym;
prev_except_loc : tlocation;
begin begin
location_reset(location,LOC_VOID,OS_NO); location_reset(location,LOC_VOID,OS_NO);
@ -281,6 +284,7 @@ implementation
{ 1) prepare the location where we'll store it } { 1) prepare the location where we'll store it }
location_reset_ref(exceptvarsym.localloc,LOC_REFERENCE,OS_ADDR,sizeof(pint)); location_reset_ref(exceptvarsym.localloc,LOC_REFERENCE,OS_ADDR,sizeof(pint));
tg.GetLocal(current_asmdata.CurrAsmList,sizeof(pint),exceptvarsym.vardef,exceptvarsym.localloc.reference); tg.GetLocal(current_asmdata.CurrAsmList,sizeof(pint),exceptvarsym.vardef,exceptvarsym.localloc.reference);
prev_except_loc:=current_except_loc;
current_except_loc:=exceptvarsym.localloc; current_except_loc:=exceptvarsym.localloc;
{ 2) the exception variable is at the top of the evaluation stack { 2) the exception variable is at the top of the evaluation stack
(placed there by the JVM) -> adjust stack count, then store it } (placed there by the JVM) -> adjust stack count, then store it }
@ -293,7 +297,7 @@ implementation
{ clear some stuff } { clear some stuff }
tg.UngetLocal(current_asmdata.CurrAsmList,exceptvarsym.localloc.reference); tg.UngetLocal(current_asmdata.CurrAsmList,exceptvarsym.localloc.reference);
exceptvarsym.localloc.loc:=LOC_INVALID; exceptvarsym.localloc.loc:=LOC_INVALID;
current_except_loc.loc:=LOC_INVALID; current_except_loc:=prev_except_loc;
hlcg.a_jmp_always(current_asmdata.CurrAsmList,endexceptlabel); hlcg.a_jmp_always(current_asmdata.CurrAsmList,endexceptlabel);
flowcontrol:=oldflowcontrol+(flowcontrol-[fc_inflowcontrol]); flowcontrol:=oldflowcontrol+(flowcontrol-[fc_inflowcontrol]);