From 51864b0458a2d44af4a5670b576866f03d18e31f Mon Sep 17 00:00:00 2001 From: Jonas Maebe Date: Sat, 29 Aug 2015 21:06:23 +0000 Subject: [PATCH] * skip temp (de)allocs when looking for store/regdealloc/load and regalloc/regdealloc sequences git-svn-id: trunk@31454 - --- compiler/jvm/rgcpu.pas | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/jvm/rgcpu.pas b/compiler/jvm/rgcpu.pas index 129c3453db..e58da30829 100644 --- a/compiler/jvm/rgcpu.pas +++ b/compiler/jvm/rgcpu.pas @@ -181,8 +181,8 @@ implementation and remove. We don't have to check that the load/store types match, because they have to for this to be valid JVM code } - dealloc:=nextskipping(p,[ait_comment]); - load:=nextskipping(dealloc,[ait_comment]); + dealloc:=nextskipping(p,[ait_comment,ait_tempalloc]); + load:=nextskipping(dealloc,[ait_comment,ait_tempalloc]); reg:=NR_NO; if issimpleregstore(p,reg,true) and isregallocoftyp(dealloc,ra_dealloc,reg) and @@ -215,7 +215,7 @@ implementation ait_regalloc: begin reg:=NR_NO; - next:=nextskipping(p,[ait_comment]); + next:=nextskipping(p,[ait_comment,ait_tempalloc]); nextnext:=nextskipping(next,[ait_comment,ait_regalloc]); if assigned(nextnext) then begin