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

* make sure that the expression representing the ansi/unicodestring argument

Browse Source 
to length is never evaluated more than once

git-svn-id: branches/jvmbackend@18736 -
This commit is contained in:
Jonas Maebe 2011-08-20 08:30:02 +00:00
parent 707b41b159
commit c2f2a8c900
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
compiler/jvm/njvminl.pas
View File

@ -572,8 +572,10 @@ implementation
var
newblock: tblocknode;
newstatement: tstatementnode;
lefttemp,
lentemp: ttempcreatenode;
ifcond,
stringtemp,
stringnonnull,
stringnull: tnode;
psym: tsym;
@ -593,28 +595,43 @@ implementation
else
stringclass:=java_jlstring;
newblock:=internalstatements(newstatement);
{ store left into a temp since it may contain a function call
(which must not be evaluated twice) }
if node_complexity(left)>4 then
begin
lefttemp:=ctempcreatenode.create_value(stringclass,stringclass.size,tt_persistent,true,ctypeconvnode.create_explicit(left,stringclass));
addstatement(newstatement,lefttemp);
stringtemp:=ctemprefnode.create(lefttemp)
end
else
begin
lefttemp:=nil;
stringtemp:=left;
end;
left:=nil;
lentemp:=ctempcreatenode.create(s32inttype,s32inttype.size,tt_persistent,true);
addstatement(newstatement,lentemp);
{ if-condition }
{ if-condition: assigned(stringclass(stringvar))? }
ifcond:=cinlinenode.create(in_assigned_x,false,
ccallparanode.create(ctypeconvnode.create_explicit(left.getcopy,stringclass),nil));
{ then-path (reuse left, since last use) }
ccallparanode.create(stringtemp.getcopy,nil));
{ then-path: call length() method }
psym:=search_struct_member(tabstractrecorddef(stringclass),'LENGTH');
if not assigned(psym) or
(psym.typ<>procsym) then
internalerror(2011031403);
stringnonnull:=cassignmentnode.create(
ctemprefnode.create(lentemp),
ccallnode.create(nil,tprocsym(psym),psym.owner,
ctypeconvnode.create_explicit(left,stringclass),[]));
left:=nil;
{ else-path}
ccallnode.create(nil,tprocsym(psym),psym.owner,stringtemp,[]));
{ else-path: length is 0 }
stringnull:=cassignmentnode.create(
ctemprefnode.create(lentemp),
genintconstnode(0));
{ complete if-statement }
addstatement(newstatement,cifnode.create(ifcond,stringnonnull,stringnull));
{ return temp }
{ free lefttemp }
if assigned(lefttemp) then
addstatement(newstatement,ctempdeletenode.create(lefttemp));
{ return len temp }
addstatement(newstatement,ctempdeletenode.create_normal_temp(lentemp));
addstatement(newstatement,ctemprefnode.create(lentemp));
result:=newblock;